[darcs-users] When patches are modified?
vmiklos at frugalware.org
Fri Oct 12 10:25:49 UTC 2007
On Thu, Oct 11, 2007 at 12:47:58AM +0300, Pekka Pessi <ppessi at gmail.com> wrote:
> darcs (to be precise, 1.0.9~rc1 on Debian Etch and/or Ubuntu Feisty)
> seems to add 'merger' things to patches sometimes.
> When they are added (pull, apply, optimize, something else)?
when you record a patch after using mark-conflicts
> Why adding stuff to patch (merger things) or modifying it (the hunk
> line numbers) does not change the date/hash of the patch? I mean, it
> is not the same patch anymore, so why pretend it is?
here is the situation when you get mergers in a patch:
you pull, there are conflicts. now you resolve the conflict manually and
record. the origianl patches still conflict, but as long as a later
patch has a merger to resolve the conflict, other people won't see
anything when they pull or get
> Is this bug or a feature?
definitely the later.
> Most importantly, how I can get rid of the mergers?
edit (unrecord, modify, record) one of the conflicting patches so that
no conflict will occur and no mergers will be necessary (i don't think
you want this)
> It is bloody annoying when rollback does not and pulling "same"
> patches through different repos result in different results.
are you sure this is related?
> Also, darcs check --complete does not complain when patch and its
> rollback are different.
maybe somebody else who has better "darcs internals" knowledge than me
can answer this, i don't know if rollbacked patches are stored twice
only in the inventory or not (i think yes, but not sure - and in that
case i have no idea how this - your problem - can happen)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 189 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20071012/047d4edf/attachment.pgp
More information about the darcs-users