Ævar Arnfjörð Bjarmason wrote:
diff -ru phase3_2/includes/CVS/Entries mediawiki/phase3/includes/CVS/Entries --- phase3_2/includes/CVS/Entries 2004-07-22 23:48:04.974484648 +0000 +++ mediawiki/phase3/includes/CVS/Entries 2004-07-22 22:53:51.957541168 +0000 @@ -58,11 +58,13 @@ /LinksUpdate.php/1.23/Thu Jul 22 22:53:51 2004// /LoadBalancer.php/1.8/Thu Jul 22 22:53:51 2004// /LogPage.php/1.12/Thu Jul 22 22:53:51 2004// +/MagicWord.php/1.20/Thu Jul 22 22:53:51 2004//
Quick note: it's best if you can make patches with 'cvs diff -u' rather than a recursive diff of two separate checked out source trees. This keeps CVS's bookkeeping files out of the diff and makes things a little easier to manage.
-- brion vibber (brion @ pobox.com)