[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: A question on merge

From: Ryan Schmidt <subversion-2008a_at_ryandesign.com>
Date: Sun, 30 Mar 2008 23:01:57 -0500

On Mar 30, 2008, at 21:43, Ding Honghui wrote:

> At version 9, I copy trunk code as branch and develop both in
> branch and
> trunk. Now, I want merge the branch code to trunk and I forgot which
> version I copied to. Then how can I merge the change back to trunk?

At *revision* 9, you copied trunk to a new branch. Hopefully, that's
all you did in revision 9 -- that is, hopefully you didn't copy trunk
to a branch *and* make changes in the branch in revision 9.

Now you've made changes in the branch and let's assume the HEAD of
the repository is now 20 and you want to merge the branch back into
the trunk. Get a working copy of trunk, and merge revisions 9 thru 20
of the branch to the trunk, like this:

svn merge -r 9:20 url://to/your/branch

Resolve any conflicts, test to make sure everything works, then you
can commit the change:

svn ci -m "Merging r9:20 of my branch into trunk"

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-03-31 06:02:59 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.