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

Re: [PATCH] Changes to merge test 78

From: Senthil Kumaran S <senthil_at_collab.net>
Date: 2007-12-18 21:34:52 CET

Hi Kamesh,

Kamesh Jayachandran wrote:
> I would suggest changing this testcase to retain first prop changes in
> alpha(r2 change) and drop the adhoc change.

As per your comments, I ve modified the patch (attached).

[[[
On the issue-2897 branch:

Set property on alpha and beta files.

* subversion/tests/cmdline/merge_tests.py
   (merge_non_reflective_text_and_prop_change): Set property on both alpha
    and beta files.

Patch by: stylesen
Suggested by: kameshj
]]]

Thank You.

--
Senthil Kumaran S
http://www.stylesen.org/


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Tue Dec 18 11:04:51 2007

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