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

RE: updating a branch from the trunk

From: Gale, David <David.Gale_at_Hypertherm.com>
Date: 2006-03-16 15:22:58 CET

Noam Tamim wrote:
> Hi,
>
> I have a branch, let's call it MyBranch. It was branched off the
> trunk at revision 100. I did many code changes on that branch, and
> merged them into the trunk at rev. 200 - resolving all conflicts in
> the process.
>
> The trunk was updated, and now the HEAD is 300.
>
> I now want to continue working on MyBranch. But first, I want it to
> be equal to the current trunk.
>
> Can I do this? Can I merge trunk 200:300 to MyBranch, while
> overwriting the files in MyBranch (so that in the end the contents of
> both the trunk and the branch are the same)?
>
> Another option I thought of was to delete MyBranch, and recreate it
> from the trunk. But I want the log messages to be kept in MyBranch...
>
> Thanks,
> Noam.

If you want the branch to equal the trunk (so, are you sure no one's
touched the branch since it was merged in?), go to a working copy of
your branch, and do:

svn merge <repos>/branches/MyBranch <repos>/trunk .

This translates to, "Take all of the changes needed to change MyBranch
into trunk, and apply them to the current directory," which is what you
want.

-David

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 16 15:25:42 2006

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