[darcs-users] conflicts again

[Jamie Webb]

On Sat, Jan 08, 2005 at 04:16:05PM +0100, Ketil Malde wrote:
> But the question is whether it is possible to convince a repo
> that a set of manual changes are, in fact, the equivalent of an
> about-to-be-pulled patch and its conflict resolution?  I.e. some kind
> of shortcut when darcs runs into the conflict black hole.

Mmm, I'd find this useful too. A couple of known bugs are preventing
me from doing a rather complex merge, and I have the same requirement
that the repos end up 'compatible'. Presumably it's possible to fool
Darcs into thinking that two patches are the same with a little
hacking of the inventory. Any chance of a HOWTO? What might happen
when pulling between repos that appear the same but actually have
different commutation behaviours?
</aol>

-- Jamie Webb