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

[Alan Schmitt <alan.schmitt@xxxxxxxx>]

Hi,

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.

Alan

* 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.