| commit | e9b8723a3ae4c5bb7b6b0abe8942a3fb101ec64b | |
| author | Theodore Ts'o <tytso@mit.edu> | |
| Mon, 26 Feb 2007 03:58:09 +0000 (25 22:58 -0500) | ||
| committer | Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu> | |
| Mon, 26 Feb 2007 06:31:36 +0000 (26 01:31 -0500) | ||
| tree | 85781b72d4e1653ef2b9705b3ee09b03dee5668c | treesnapshot (tar.gz zip) |
| parent | b10a3228fdeb495a2f576e1678cb53d0c6358528 | commitdiff |
[PATCH] Make "guilt push" match "quilt push" when the patch doesn't apply
Sometimes the reason why the patch doesn't apply is because it has
already been applied in mainline when rebasing a patch series. It is
therefore more convenient if "guilt push" leaves the working tree
untouched if the patch fails to apply unless explicitly asked to force
apply a failing patch using the -f option.
This behavior matches how "quilt push" and "hg qpush" works, so it
also avoids unpleasant surprises for developers used to other patch
series tools.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu>
Sometimes the reason why the patch doesn't apply is because it has
already been applied in mainline when rebasing a patch series. It is
therefore more convenient if "guilt push" leaves the working tree
untouched if the patch fails to apply unless explicitly asked to force
apply a failing patch using the -f option.
This behavior matches how "quilt push" and "hg qpush" works, so it
also avoids unpleasant surprises for developers used to other patch
series tools.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu>
| guilt | diffblobblamehistory | |
| guilt-push | diffblobblamehistory |