Complete.Org: Mailing Lists: Archives: freeciv-dev: March 2002:
[Freeciv-Dev] Re: A clever way to update patches.

[Freeciv-Dev] Re: A clever way to update patches.

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: Gregory Berkolaiko <Gregory.Berkolaiko@xxxxxxxxxxxx>
Cc: freeciv-dev@xxxxxxxxxxx
Subject: [Freeciv-Dev] Re: A clever way to update patches.
From: Alan Schmitt <alan.schmitt@xxxxxxxx>
Date: Fri, 15 Mar 2002 08:58:46 +0100


You could create diffs against cvs and use the diffmode of vim (that
highlights differences and folds identical things). I've found it very
useful, and it works with file / file and file / diff.

Emacs probably has such a thing too.


* Gregory Berkolaiko (Gregory.Berkolaiko@xxxxxxxxxxxx) wrote:
> Is there a clever way to update patches?
> What I usually do is apply the patch over the old version of the code, 
> then do 
> cvs up
> and then resolve the conflicts by hand.
> I could also do 
> cvs up 
> first and then do
> patch < ....
> and work with the rejects files.  although I prefer CVS way of denoting 
> conflics.
> But maybe there is some fancy editor that can highlight the conflicting 
> parts in the patch and the code so I can change the patch itself, before 
> I try to apply it?
> Is xmerge any good?
> Best,
> G.

The hacker: someone who figured things out and made something cool happen.

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