|
From: | Aaron Bentley |
Subject: | Re: [Gnu-arch-users] merge trouble |
Date: | Thu, 03 Mar 2005 18:38:08 -0500 |
User-agent: | Debian Thunderbird 1.0 (X11/20050116) |
Miles Bader wrote:
I suppose if tla is going to continue to use the standard patch command, it could do some sort of horrible kludgey thing with --forward by examining the results of patch, splitting up --forward-generated .rej files and trying to reapply them..... gack.
The kludge I came up with was: 1. make a scratch copy2. apply the patch backwards to the scratch copy. Everything will conflict, except whatever was already applied. 3. apply the conflicts backwards (i.e. in the same direction as the original patch) to the real copy
Aaron
[Prev in Thread] | Current Thread | [Next in Thread] |