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

Re: SVN 1.5 - svn merge --reintegrate

From: David Glasser <glasser_at_davidglasser.net>
Date: Mon, 24 Mar 2008 20:54:54 -0700

On Mon, Mar 24, 2008 at 3:55 PM, Karl Heinz Marbaise <khmarbaise_at_gmx.de> wrote:
> Hi there,
> i have read the book and checked different sources of information...but
> it seemed to me that i missed something....
> or to say it different...i don't understand the need of --reintegrate
> during a merge?
> Ok. a simple situation like this:
> create a branch (B_TEST) from trunk, modified the branch and do a merge
> back to trunk.
> For this i would use in a trunk-wc
> svn merge URL/branches/B_TEST
> so would be there a difference if i used
> svn merge --reintegraed URL/branches/B_TEST instead ?
> Does it change the situation if i would change the branch after i merged
> it back to the trunk?
> Or: When do i really need the --reintegrate option of svn merge command?
> Can someone give me a hint where i find an explanation?

--reintegrate starts to show its worth when you'd merged from the
trunk to the branch one or more times before merging back. Give it a
shot and let me know if it makes sense.


David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-25 04:55:09 CET

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