[darcs-users] -p behaves inconsistently
Tommy Pettersson
ptp at lysator.liu.se
Tue Nov 7 18:54:41 UTC 2006
On Sun, Nov 05, 2006 at 12:40:09AM +0900, stephen at xemacs.org wrote:
> > (perhaps excessively) abide to the patch algebra rules. I
> > suspect there is a way to trim this to do The right thing,
>
> I doubt it, in general. The canonical example is the one given in the
> Darcs manual (IIRC) where two patches each add one element to an enum
> in a way that doesn't conflict, and then add
>
> + #define ENUM_ELEMENT_COUNT 11
I'm sorry, it was very unclear both from the context and from my
writing what exactly I was thinking about.
What you describe is a pair of conflicting _parallel_ patches.
This is a case that darcs detects but most other RCSs miss. But
what I was after is two or more sequential patches appending (or
prepending) lines to a file.
If I record three new entries at the end of my changelog, one at
a time, I can not pull them arbitrarily to another repo,
although it seems very reasonable I _should_ be able to. They
have a well defined order, so it should not matter in which
order I pull them. But the way darcs "stores" the order is by
making them depend on each other, so I can't pull the last one
without also pulling the previous ones. This is what confused
Jim at the beginning of this tread.
--
Tommy Pettersson <ptp at lysator.liu.se>
More information about the darcs-users
mailing list