Hi, I've just joined the list, and have been browsing back through the archives to see if a svnmerge problem I'm having is known.
(Problem: 1) Create branch a from trunk, and svnmerge init in the trunk (i.e. intend to merge from the branch to the trunk). 2) Change a file in the trunk and commit 3) Rename the file in the branch, and commit. 4) "svnmerge merge" in the trunk. This captures the rename, but loses the changes made in the trunk in step 2. Found it is known, thread in July 2008). In that thread (Renames/Moves followed by merge), Nico indicated you are working on a merge helper script for this issue (and a number of other use cases). Has that helper seen the light of day yet? Thanks from a newbie... Bob Sandiford Lead Software Engineer, Software Development [cid:[email protected]] 611 Kumpf Drive, Unit 300 Waterloo, ON, Canada N2V 1K8 Phone: 800-288-8020 X6943 Fax: 519-747-4262 [email protected]
<<inline: image001.gif>>
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
