[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Consistent variable name in merge test file

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-07-06 14:43:14 CEST

Thanks Senthil,

Committed in r25668.

With regards
Kamesh Jayachandran
Senthil Kumaran S wrote:
> Hi,
>
> I am attaching the patch to fix consistent variable name (wc.StateItem
> is referred as Item) across merge test file along with this mail.
>
> Thank You,
> Senthil Kumaran S
>
> ------------------------------------------------------------------------
>
> Index: subversion/tests/cmdline/merge_tests.py
> ===================================================================
> --- subversion/tests/cmdline/merge_tests.py (revision 25665)
> +++ subversion/tests/cmdline/merge_tests.py (working copy)
> @@ -300,9 +300,9 @@
> expected_output = wc.State(os.path.join(other_wc, 'A', 'D', 'G'),
> {'rho' : Item(status='G ')})
> expected_disk = wc.State("", {
> - 'pi' : wc.StateItem("This is the file 'pi'.\n"),
> - 'rho' : wc.StateItem("This is the file 'rho'.\n"),
> - 'tau' : wc.StateItem("This is the file 'tau'.\n"),
> + 'pi' : Item("This is the file 'pi'.\n"),
> + 'rho' : Item("This is the file 'rho'.\n"),
> + 'tau' : Item("This is the file 'tau'.\n"),
> })
> expected_disk.tweak('rho',
> contents=other_rho_text
>
> ------------------------------------------------------------------------
>
> [[[
> Fix consistent naming of variable in merge test file.
>
> * subversion/tests/cmdline/merge_tests.py
> (merge_singleton_handler): modify wc.StateItem to Item whereever used
>
> Patch by: Senthil Kumaran <senthil@collab.net>
> ]]]
>
>
> ------------------------------------------------------------------------
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 6 14:42:04 2007

This is an archived mail posted to the Subversion Dev mailing list.