r3732 - branches/nexuiz-2.0

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Jun 29 06:37:37 EDT 2008


Author: div0
Date: 2008-06-29 06:37:37 -0400 (Sun, 29 Jun 2008)
New Revision: 3732

Modified:
   branches/nexuiz-2.0/branch-manager
Log:
improve branch-manager merge output a little


Modified: branches/nexuiz-2.0/branch-manager
===================================================================
--- branches/nexuiz-2.0/branch-manager	2008-06-29 10:35:30 UTC (rev 3731)
+++ branches/nexuiz-2.0/branch-manager	2008-06-29 10:37:37 UTC (rev 3732)
@@ -227,6 +227,9 @@
 	AddPatch $first, $last;
 
 	print OutputOf 'svn merge -r#1:#2 #3', ($first - 1), $last, $conf{master};
+	print "You may also want to run $0 unmerged to fill possible revision holes\n";
+	print "Make sure there are no conflicts, then run $0 commit\n";
+	print "To abort, use $0 revert\n";
 	
 	open my $fh, '>', '.commitmsg'
 		or die "open .commitmsg";
@@ -247,6 +250,8 @@
 	RemovePatch $first, $last;
 
 	print OutputOf 'svn merge -r#2:#1 #3', ($first - 1), $last, $conf{master};
+	print "Make sure there are no conflicts, then run $0 commit\n";
+	print "To abort, use $0 revert\n";
 
 	open my $fh, '>', '.commitmsg'
 		or die "open .commitmsg";
@@ -286,8 +291,8 @@
   $0 init masterrepo rev
   $0 info
   $0 unmerged
-  $0 merge rev1 rev2
-  $0 undo rev1 rev2
+  $0 merge rev1 [rev2]
+  $0 undo rev1 [rev2]
   $0 commit
   $0 revert
 EOF




More information about the nexuiz-commits mailing list