Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e8fe56
)
Using rebase for the patches has become a failing-hunk
author
Wayne Davison
<wayned@samba.org>
Thu, 7 Feb 2008 00:39:53 +0000
(16:39 -0800)
committer
Wayne Davison
<wayned@samba.org>
Thu, 7 Feb 2008 00:39:53 +0000
(16:39 -0800)
pain in the neck, so I'm switching to using merge.
support/patch-update
patch
|
blob
|
blame
|
history
diff --git
a/support/patch-update
b/support/patch-update
index
a76f111
..
dcfeb6f
100755
(executable)
--- a/
support/patch-update
+++ b/
support/patch-update
@@
-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;
}