mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-03-04 22:48:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Using rebase for the patches has become a failing-hunk

Browse Source 
pain in the neck, so I'm switching to using merge.
This commit is contained in:
Wayne Davison
2008-02-06 16:39:53 -08:00
parent 3e8fe565ed
commit e7f642cffe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
support/patch-update
View File

@@ -138,8 +138,8 @@ sub update_patch
open(OUT, '>', "$patches_dir/$patch.diff") or die $!;
print OUT $description{$patch}, "\n";
if (system("git rebase -m $parent") != 0) {
print qq|"git rebase -m $parent" incomplete -- please fix.\n|;
if (system("git merge $parent") != 0) {
print qq|"git merge $parent" incomplete -- please fix.\n|;
$ENV{PS1} = "[$parent] patch/$patch: ";
system $ENV{SHELL} and exit 1;
}