[email protected] wrote: > Yes, I could do that, but I'd rather not. All of the documentation on > the svnmerge wiki says that I should only need to specify the source > when I'm merging multiple branches to this one, which I'm not. I'm > also trying to keep the amount of things my developers need to > remember about this to a minimum as some of them are still very new > to this developer branch idea.
Does "svn pg svnmerge-integrated" in the branch report more than the trunk? It should say something like "Project/trunk:nnnn". If some other branch or branches are printed then you'll face the problem you mentioned. You may want to edit the svnmerge-integrated property in the branch and delete the branch/branches part leaving the trunk alone. I think "svnmerge.py init" in a new branch gets confused if you have previously moved or renamed an old branch to trunk. > > Erik Andersson wrote: >> Hi >> >> You can specify the source? >> >> something like: >> svnmerge.py -S trunk avail -l >> >> Cheers / Erik >> >> On Wed, Jan 14, 2009 at 12:55 PM, Jon Schewe <[email protected] >> <mailto:[email protected]>> wrote: >> >> I've created some development branches off of my trunk and I've >> been happily merging back and forth. Now a new developer is on >> the project and I created a new developer branch for him by >> using svn copy. I then did svnmerge.py init in his branch and >> svnmerge.py init <branch path> in trunk. Now in the new >> developer branch when I do svnmerge.py merge I'm prompted for >> which source I should use as all of the merge sources from >> the trunk are there. Do I need to uninit each branch from the >> developer branch? Or is there some other way to handle this? _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
