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

Re: [PATCH][merge-tracking] Fix the merge_tests.py #36

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-09-20 20:36:28 CEST

On Wed, 20 Sep 2006, Kamesh Jayachandran wrote:
...
> Fix 'merge_conflict_markers_matching_eol' testcase taking care of
> 'merge-tracking' implementation.
>
> * subversion/tests/cmdline/merge_tests.py
> (merge_conflict_markers_matching_eol):
> Expect to have 'prop modified' at target root.

Thanks Kamesh, committed in r21567.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 20 20:59:50 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.