RFC: Would you care if mq stopped storing patch files physically on disk?
Benoit Boissinot
benoit.boissinot at ens-lyon.org
Fri Nov 27 10:50:12 CST 2009
On Fri, Nov 27, 2009 at 05:35:51PM +0100, Christian Boos wrote:
> Peter Hosey wrote:
> >On Nov 26, 2009, at 23:53:10, Peter Arrenbrecht wrote:
> >>So, are you using the fact that mq stores the patch files
> >>physically on disk in your workflows? If so, how?
> >
> >I sometimes have to hand-edit the patches because mq is so finicky
> >about patches having to *exactly match* whatever's in the source
> >code. I would welcome a real solution to that problem.
>
> Try apply the .rej file via wiggle [1].
>
> Now if hg would by itself fallback to word level merges when a chunk
> fails to apply, that would be excellent ;-)
Or maybe do merge with the same patch applied to the previous parent.
Benoit
--
:wq
More information about the Mercurial
mailing list