Re: Struggling with SVN

On Tue, Jun 30, 2009 at 11:15 AM, Chris Fryer<chrisf1874@...> wrote:
> How do I merge all revisions from trunk version 10208 to HEAD into my branch?

(sitting in your branch's working copy)

$ svn merge -r10208:HEAD
https://rosegarden.svn.sourceforge.net:/svnroot/rosegarden/trunk/rosegarden

I actually never type HEAD in that context, I always look up the
actual revision (currently 10456) and use that instead... for weird
superstitious reasons that I can't properly explain.

That will merge to your current working copy -- it doesn't affect the
repository.

It's conceptually equivalent to the following (though this wouldn't
actually work exactly as written):

$ svn diff -r10208:HEAD
https://rosegarden.svn.sourceforge.net:/svnroot/rosegarden/trunk/rosegarden
> patchfile
$ patch < patchfile

However, I wouldn't actually do the merge in that direction if I were
you.  I would merge straight back to the trunk.  That's _because_ the
merge only directly affects the working copy, so you have plenty of
opportunity to resolve any conflicts, build, and test before you
commit.  It also seems intuitively more sensible to keep the merge as
small as possible.

i.e. I would do something like

$ svn co https://rosegarden.svn.sourceforge.net:/svnroot/rosegarden/trunk/rosegarden
tmp-working-copy
$ cd tmp-working-copy
$ svn merge -r10208:HEAD
https://rosegarden.svn.sourceforge.net:/svnroot/rosegarden/branches/newcontrolrulers
[... resolve conflicts, build, test ...]
[... run "svn diff" and make sure what you're about to commit looks sane ...]
$ svn commit

That way you're pretty much guaranteed to make sure you commit nothing
more than a correct set of diffs that reflect what you did on your
branch, and you do it in a single commit.

> When I used the command above, it was merging stuff from revisions in
> the 6 and 7 thousands!

That's because you didn't give a revision range, and Subversion
doesn't actually know where your branch started.  Subversion doesn't
do any meaningful branch tracking at all.


Chris

------------------------------------------------------------------------------
_______________________________________________
Rosegarden-devel mailing list
Rosegarden-devel@... - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel