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

Re: Account for reflected revisions when performing cyclic merges

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-06-14 22:51:33 CEST

On Thu, 14 Jun 2007, Folker Schamel wrote:

> Folker Schamel wrote:
> > Daniel Berlin wrote:
> >> ...
> >>
> >> The initial merge tracking implementation was not meant to handle
> >> repeated bidirectional merging, at least, as designed.
> >>
> >> ...
> >>
> >> The original goal was to provide much the same functionality as
> >> svnmerge.py on a per-file basis.
> >>
> >> ...
> >
> > Just a note:
> > svnmerge provides repeated bidirectional merging by the --bidirectional flag.
>
> See also http://svn.haxx.se/dev/archive-2007-03/0234.shtml

In the A -> B -> A case, neither Subversion nor svnmerge.py can readily
support bi-directional merging correctly, since Subversion does not track
multiple parents for a change (it only tracks one).

We'd have to change Subversion's FS schema to make this possible.

  • application/pgp-signature attachment: stored
Received on Thu Jun 14 22:53:03 2007

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.