[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

(Update) prfmerge: A script that repairs CVS merging conflicts



Yesterday I posted this message:

> please find attached a short Perl script that repairs .prf files
> containing merge conflicts induced by a CVS update or join.  This
> script helps groups of people using CVS to collaborate working in the
> same PVS source files.

Please note that future versions of this tool will be posted on its
new download website: 
  http://os.inf.tu-dresden.de/vfiasco/prfmerge.html

BTW, the version I posted yesterday has at least one bug, for which I
append a patch below.  The version on the download site has some more
substantial updates.

Kind regards,
Michael
-- 
hohmuth@sax.de, hohmuth@inf.tu-dresden.de
http://www.sax.de/~hohmuth/

? challenge-segmem.prf
? foo
? foo.prf
? perllib
Index: prfmerge
===================================================================
RCS file: /home/hohmuth/local/var/cvs/vfiasco/src/tool/prfmerge/prfmerge,v
retrieving revision 1.3
diff -u -p -r1.3 prfmerge
--- prfmerge	17 Jul 2003 13:24:50 -0000	1.3
+++ prfmerge	18 Jul 2003 17:48:17 -0000
@@ -320,7 +320,7 @@ $oldver = $input;
 $oldver =~ s/<<<<<<< [^\n]* \n
              ( (?:.(?!=======))* \n )
              (?:.(?!>>>>>>>))* \n [^\n]+\n
-            /$1/sx;
+            /$1/sgx;
 
 tokenize($oldver);
 @old = read_all();
@@ -329,7 +329,7 @@ $newver = $input;
 $newver =~ s/<<<<<<< [^\n]* \n
              (?:.(?!=======))* \n [^\n]+\n
              ( (?:.(?!>>>>>>>))* \n ) [^\n]+\n
-            /$1/sx;
+            /$1/sgx;
 
 tokenize($newver);
 @new = read_all();