From: Juliusz Chroboczek <[EMAIL PROTECTED]>
Date: Mon, 03 Jul 2006 20:03:05 +0200
Message-ID: <[EMAIL PROTECTED]>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
--text follows this line--
Simon P.-J. :
> I understand your solution A as follows.
>
> In the main reposiitory:
> darcs diff -p 'The offending patch' > patchfile
>
> Transport 'patchfile' to the variant repository. Then:
> patch < patchfile
>
> Now record this patch and push it back to the main repository
> darcs record (with patchname 'Duplicate offending patch')
> darcs push -a
Not quite.
In the variant repository,
darcs diff -u --patch='The offending patch' > patchfile
In the main repository
patch -p1 < patchfile
-- fix merge conflicts
darcs record -a
In the variant repository
darcs unpull --patches='The offending patch'
darcs pull
However, you may find out that the last darcs pull fails (up to
symmetry, it's the same commutation as the one that failed in the
first place). If so, I suggest that you discard the variant
repository and rebuild it from scratch.
In order to avoid spurious merge conflicts, you will have to make sure
that every person who ever pulled from the variant repository either
unpulls the (now obsolete) patch, or does a fresh darcs get. My
solution to this issue is to put a human-readable warning in
_darcs/prefs/motd
Hope this helps,
Juliusz
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
