quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

branch-manager fixes

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@215 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-03-09 13:27:02 +00:00
parent 749ab6b3fa
commit 4a43b9f1ae
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.patchsets
View File

@ -1,3 +1,3 @@
master = https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/1.5 master = https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/1.5
revisions_applied = 1-321 revisions_applied = 1-327

3
branch-manager
View File

@ -272,6 +272,7 @@ elsif($cmd eq 'merge')
open my $fh, '>>', '.commitmsg' open my $fh, '>>', '.commitmsg'
or die "open .commitmsg"; or die "open .commitmsg";
print $fh GetLog $first, $last; print $fh GetLog $first, $last;
print $fh "\n";
close $fh; close $fh;
WriteSettings(); WriteSettings();
@ -298,7 +299,7 @@ elsif($cmd eq 'undo')
open my $fh, '>>', '.commitmsg' open my $fh, '>>', '.commitmsg'
or die "open .commitmsg"; or die "open .commitmsg";
print $fh "undo the following merge:\n", GetLog $first, last; print $fh "undo the following merge:\n", GetLog $first, $last;
close $fh; close $fh;
WriteSettings(); WriteSettings();