|Trying to understand subversive merging [message #644898]
||Tue, 14 December 2010 11:37
| Steve Cohen
Registered: July 2009
Merging in subversive is an exercise in masochism. The documentation is the worst kind, screen shots that tell you "what does each control do" without any of what you are really looking for: "if you want to do this common operation, choose these options". Obscure phrases are assumed to be self-defining.|
I find that what should be the simplest types of merges in subversive always have to be reverted out of, and then I give up and use the command line.
I have a trunk and a branch, say branch_1 stored in the usual places in the repository. There are two revisions to branch_1 since it was last merged back to trunk. My current working directory is an up-to-date working copy of the trunk
svn merge svn://myrepo.com:13048/project/trunk svn://myrepo.com:13048/project/branches/branch_1 .
gives me exactly what I want, all the changes made since the last merge. What could be simpler?
Nothing I have tried in subversive works as well. There are always issues. Conflicts. Too many choices. Am I doing something wrong or is subversive merging broken beyond repair? If someone will tell me the correct way to do this, I will be happy to try it.
And what does "Depth: Working Copy" mean, actually? Nothing in the documentation explains this.
One more suggestion? If subversive merge is creating a command line behind the scenes, a possibly useful feature would be an option to display these command lines so that the perplexed user might understand better what his options are actually doing.
|Re: Trying to understand subversive merging [message #757179 is a reply to message #655336]
||Wed, 16 November 2011 19:31
| Vladimir Grishchenko
Registered: July 2009
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.
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:
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: Wed, 16 November 2011 20:11]
Report message to a moderator
Powered by FUDForum
. Page generated in 0.02999 seconds