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

Re: Branch management. Merge tracking.

From: Erik Wasser <erik.wasser_at_iquer.net>
Date: 2004-12-08 16:57:02 CET

On Wednesday 08 December 2004 15:58, Nick Patavalis wrote:

> As far as I understand, once I've merged from the trunk to the
> branch, I can no longer hope for a way to merge from the branch back
> to the trunk; at least not without risking conflicts from the changes
> merged earlier from the trunk.

You have to remember the changes you already merged from the branch back
to the main trunk. Or give 'svnmerge' a try.

In my patches directory I got a little textfile for myself like this:

-> 20 Created with revision 20.
-> 21:60 Merged postgresql changes from main trunk
          'svn -r 21:60 merge ../../src/. .'
<- 61:62 Merged little changes to the main trunk
          'svn -r 61:62 merge ../patches/sawmill/. .'

-> from main trunk to patch
<- from patch to main trunk

With this helpfile I can track the merges from the main trunk to the

So long... Fuzz
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 8 18:16:07 2004

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.