[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] how to recover from large conflicts?

From: Denys Duchier
Subject: Re: [Gnu-arch-users] how to recover from large conflicts?
Date: Thu, 25 Sep 2003 02:24:12 +0200
User-agent: Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3 (gnu/linux)

Miles Bader <address@hidden> writes:

> * Try applying the .rej file with `patch -l', which causes patch to ignore
>   whitespace for matching purposes.

as I mentioned to Tom, this won't work for Python code.

> * If you want to hack the .rej file, you just have to be careful to update
>   the hunk line counts, and make sure all lines start with a space/+/-
>   character as appropriate.

well, I hacked the .rej file and played with --fuzz but could not get
it to work.

>   A good way to do this is to use emacs' `diff-mode' for your patch hacking
>   (in CVS versions of emacs, at least, it's the default for .rej files).  It
>   will automatically keep the line-counts up to date, and offers some very
>   convenient operators for editing diff files;

oooh! I didn't know about this.  I'll certainly give it a try.


Dr. Denys Duchier
Équipe Calligramme

reply via email to

[Prev in Thread] Current Thread [Next in Thread]