kfogel@collab.net wrote:
>
>"merging a file" doesn't actually mean anything in Subversion. You
>can only merge changes from one place to another. (A change might be
>the addition or deletion of a file, of course...).
>
>The typical use case is to merge an entire change (i.e., r8330) from
>one branch to another.
>
>
So going back to Ian's original request, which is to propagate bugfixes
from "core" (trunk) to "customer version A" (branches/customerA), he
needs to make those bugfixes in a single commit, where he does not
change anything else (this is good development practice anyhow). Then he
needs to merge the change to the branch:
cd /myworkingcopy/trunk/src/flibble
(apply bugfix to flibble.c)
svn commit -m "Fixed word wrap bug in flibble" flibble.c
Commited revision 768.
cd /myworkingcopy
svn merge -r 768 trunk branches/customerA
svn commit -m "Merged r768 (word wrap bug) to customerA branch"
branches/customerA
Is that about right? Does the merge argument need to be "-r 767:768"
instead?
Cheers,
Mike.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jan 17 12:58:05 2004