On Tue, 17 Oct 2006, Christopher Rasch wrote: > Hi, > > I'm trying to merge changes in a branch (1.0.x) back into trunk. > The output from "svnmerge avail -l -S 1.0.x" in the trunk directory > is below. If I try to merge all of the changes at once via the > "svnmerge merge -b -S 1.0.x" command, I get an "svnmerge: command > execution failed (exit code: 1)" error message (for details, see > immediately preceding email from me with the error message as > subject). As a workaround, I'm trying to merge the changes in the > branch individually. > > However, if I try to merge a single revision, I get the following > error message: > > crasch:~/Projects/trunk crasch$ svnmerge merge -b -S 1.0.x r12313 > svnmerge: "r12313" is not a subversion working directory > > How do I merge a single branch revision back into trunk?
trunk$ svnmerge.py merge -r12313 --source=/main/branches/release/1.0.x > crasch:~/Projects/trunk crasch$ svnmerge avail -l -S 1.0.x > ------------------------------------------------------------------------ > r12313 | crasch | 2006-09-28 14:43:26 -0400 (Thu, 28 Sep 2006) | 9 lines > Changed paths: > M /main/branches/release/1.0.x > M /main/branches/release/1.0.x/Configuration/parcel/post_install > > Merged revisions 12311 via svnmerge from > svn+ssh://svn.marketocracy.com/svn/repo/main/trunk > > ........ > r12311 | crasch | 2006-09-28 14:13:22 -0400 (Thu, 28 Sep 2006) | 1 > line > > Correct typo > ........
pgp1ALlCQWkv4.pgp
Description: PGP signature
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
