[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.
Thanks.
--
Dr. Denys Duchier
Équipe Calligramme
LORIA, Nancy, FRANCE
- Re: [Gnu-arch-users] how to recover from large conflicts?, (continued)
- Re: [Gnu-arch-users] how to recover from large conflicts?, duchier, 2003/09/25
- [Gnu-arch-users] Re: how to recover from large conflicts?, Samuel Tardieu, 2003/09/25
- Re: [Gnu-arch-users] Re: how to recover from large conflicts?, duchier, 2003/09/25
- [Gnu-arch-users] Re: how to recover from large conflicts?, Samuel Tardieu, 2003/09/25
- Re: [Gnu-arch-users] Re: how to recover from large conflicts?, duchier, 2003/09/25
- [Gnu-arch-users] Re: how to recover from large conflicts?, Miles Bader, 2003/09/25
- Re: [Gnu-arch-users] how to recover from large conflicts?, Tom Lord, 2003/09/25
- Re: [Gnu-arch-users] how to recover from large conflicts?, Denys Duchier, 2003/09/25
- Re: [Gnu-arch-users] how to recover from large conflicts?, Tom Lord, 2003/09/25
Re: [Gnu-arch-users] how to recover from large conflicts?, Miles Bader, 2003/09/24
- Re: [Gnu-arch-users] how to recover from large conflicts?,
Denys Duchier <=