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

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

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: freeciv-dev@xxxxxxxxxxx
Subject: [Freeciv-Dev] A clever way to update patches.
From: Gregory Berkolaiko <Gregory.Berkolaiko@xxxxxxxxxxxx>
Date: Thu, 14 Mar 2002 17:49:47 +0000 (GMT)

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 

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?


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