On Thu, Aug 26, 2010 at 11:50:33 -0700, Lev Lvovsky wrote: > >>> darcs get main tmp > >>> darcs pull --repo tmp main-branch > >> > >> We cannot guarantee that it'll be a prefix. In my case, the patches > >> in the branch repo happen to fall in the middle of the timeline of the > >> main repo. > > > > I'd expect the darcs get and pull approach to make it a prefix > > (since darcs will just happily commute away). > > > > You can check by doing a diff on the darcs changes output > > (perhaps both graphical and textual just to make sure) > > It's possible then, that I don't understand what a "prefix" is in > terms of darcs.
Hmm, let's see if we understand it the same way. I was thinking quite
simply in terms of the order that the patches appear in the repository.
Basically I was advocating that all patches common to repositories be
in the same exact order everywhere. This is important because we can't
guarantee that (A) converting commuted patches results in the patches
you'd get by (B) commuting converted patches. See what I mean?
I *think* I'm saying that
(X Y <-> Y' X')
NOT => (cv(X) cv(Y) <-> cv(Y') cv(X'))
Where cv means 'convert', but there's a good chance of me being wrong.
> In the case above (and in all of the cases which we try), all of the
> patches in the branch will appear after (order-wise in the 'changes'
> output) all of the main repo patches (iirc). What situations would
> not cause this "prefix" behavior?
So if you have your branch with main patches intermingled with common
patches, converting that could have unpredictable results (maybe
fine, but maybe broken)
m1 m2 c1 c2 m3 m4 is BAD (because you don't know if the m3 and m4
you get are really what you want)
m1 m2 m3 m4 c1 c2 is fine
Is that any clearer?
--
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
For a faster response, try +44 (0)1273 64 2905 or
xmpp:[email protected] (Jabber or Google Talk only)
signature.asc
Description: Digital signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
