SVN 1.5 - svn merge --reintegrate

[Karl Heinz Marbaise <kh...@gmx.de>]

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?

Thanks in advance
Kind regards
Karl Heinz Marbaise
-- 
SoftwareEntwicklung Beratung Schulung    Tel.: +49 (0) 2405 / 415 893
Dipl.Ing.(FH) Karl Heinz Marbaise        ICQ#: 135949029
Hauptstrasse 177                         USt.IdNr: DE191347579
52146 Würselen                           http://www.soebes.de

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: SVN 1.5 - svn merge --reintegrate

[David Glasser <gl...@davidglasser.net>]

On Mon, Mar 24, 2008 at 3:55 PM, Karl Heinz Marbaise <kh...@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.

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org