|
|
Re: Trying to understand subversive merging [message #757179 is a reply to message #655336] |
Thu, 17 November 2011 00:31 |
Vladimir Grishchenko Messages: 104 Registered: July 2009 |
Senior Member |
|
|
It is an old thread but I'm sort of facing the same question while trying to educate myself on SVN and Subversive. As far as I can tell Subversive always uses explicit revisions when issuing svn merge, which, as far as I understand, does not make use of the information stored in the mergeinfo property. Can someone confirm this or possibly explain how to make Subversive to not specify revision numbers during merge so that mergeinfo is used???
As for viewing the commands that are being issued you need to open SVN console.
Update:
After poking around it may be that the "Start from copy" means use mergeinfo or I don't understand how Subversive picks a start revision.
Basically this is the contents of mergeinfo on a branch that was copied from trunk rev 3221, trunk's changes then were merged into this branch ending with 3468 as indicated by the last line in mergeinfo:
/foo/bar/branches/r-2:1036
/foo/bar/branches/r-4:1368-2401
/foo/bar/branches/r-10:2402-2424
/foo/bar/trunk:3223-3468
Doing a merge preview from trunk and "Start from copy" Subversive issues this:
svn merge -r 1035:HEAD ....
while if mergeinfo was used I would expect it to be:
svn merge -r 3468:HEAD ....
or may be
svn merge -r 3221:HEAD ....
as 3221 is in fact is the revision that was used to create the merge target branch, but somehow it picks 1035, which was the revision that the trunk was created from.
[Updated on: Thu, 17 November 2011 01:11] Report message to a moderator
|
|
|
|
|
|
|
Powered by
FUDForum. Page generated in 0.03744 seconds