[darcs-users] apply darcs patch format?

David Roundy droundy at abridgegame.org
Tue May 11 11:44:41 UTC 2004


On Sun, May 09, 2004 at 02:59:09PM -0700, Adam Megacz wrote:
> 
> David Roundy <droundy at abridgegame.org> writes:
> >> If I have a patch in darcs' patchfile format (not a bundle, just a
> >> hunk), how do I apply it to 'current' (ie not alter anything in
> >> _darcs/ -- just modify the checked-out copy).
> 
> > Read it and modify the file by hand?
> 
> What do you mean by "by hand"?

I meant reading the patch file and doing the edit yourself.  Probably not
what you want to do...

> I just want the equivalent of "patch -p0 < patchfile".  No revision
> control; just patch application.

For this I'd use darcs diff -u followed by "patch -p0 < patchfile".

> > Hmmm.  I am not sure what sort of bug this would help work around...
> 
> Darcs refusing to pull patches (or taking forever to figure out how
> they commute), which seems to happen to me a lot.  The functionality
> I'm looking for is so simple that it should never fail and should
> never take very long to run.  It doesn't require any
> patch-commutability-checking.  Of course, in using this, I personally
> take on the responsibility for doing merges, but I only need this when
> darcs can't do that itself.

The problem is that darcs doesn't have any capability for doing inexact
patching, and in the situations you're describing, I don't think you're
wanting to apply the patch to a file which is identical to the version for
which the patch was created.
-- 
David Roundy
http://www.abridgegame.org




More information about the darcs-users mailing list