We used to not have reintegrate. This is because we all forgot that,
in the Subversion model, the operation of merging to your development
branch and the operation of merging back from it are actually
incredibly different (the former is a 1-URL rev-range diff, and the
latter is a 2-URL diff). Now we have reintegrate. Perhaps this is
lame, but that's how Subversion branching works.
--dave
On Tue, Nov 18, 2008 at 10:07 AM, Branko Èibej <brane_at_xbc.nu> wrote:
> Hey.
>
> A question suddenly popped into my mind.
> So we have "svn merge --reintegrate" for doing repeated merges between
> two active branches. Now I wondered, since this is probably the most
> common merge usage in a centralized version control model, wouldn't it
> be nice if one didn't have to type an unwholesomely long option to
> enable it?
>
> I'm sure I missed lots of little details here.
>
> -- Brane
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
Received on 2008-11-18 21:51:04 CET