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

Re: [PATCH] Release Notes: Information on the "natural history" currently present in svn:mergeinfo

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Tue, 03 Jun 2008 10:29:45 -0400

Marc Strapetz <marc.strapetz_at_syntevo.com> writes:
> I was not aware that --reintegrate is the recommended way to
> continuously merge back changes from a *release* branch; instead I
> thought it would only be useful for *feature* branches.
>
> So in my opinion it would be helpful to have most parts of Mark
> Phippard's reply also part of the SVN book. Furthermore, it might be
> helpful to have a short overview on feature branches vs. release
> branches and when to use --reintegrate resp. "normal" merge here.

Wait -- I think you're right, and I misdocumented it a bit in the
release notes just now. It *is* for feature branches, not for release
branches (well, release branches shouldn't get merged back to trunk
anyway).

Is this your understanding too?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-03 16:30:10 CEST

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

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