| commit | 7e5dd9f2ccf2141d65e4621b765a136796b0d55b | |
| author | Pete Wyckoff <pw@padd.com> | |
| Sun, 9 Sep 2012 20:16:05 +0000 (9 16:16 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Sep 2012 04:52:52 +0000 (16 21:52 -0700) | ||
| tree | e36a8536c70bd82813385fb772261e6dbf524569 | treesnapshot (tar.gz zip) |
| parent | 449bb9cf1a0c42ddf6e9b9b6fd447eda12f9bc92 | commitdiff |
git p4: move conflict prompt into run, add [q]uit input
When applying a commit to the p4 workspace fails, a prompt
asks what to do next. This belongs up in run() instead
of in applyCommit(), where run() can notice, for instance,
that the prompt is unnecessary because this is the last commit.
Offer two options about how to continue at conflict: [s]kip or
[q]uit. Having an explicit "quit" option gives git p4 a chance
to clean up, show the applied-commit summary, and do tag export.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When applying a commit to the p4 workspace fails, a prompt
asks what to do next. This belongs up in run() instead
of in applyCommit(), where run() can notice, for instance,
that the prompt is unnecessary because this is the last commit.
Offer two options about how to continue at conflict: [s]kip or
[q]uit. Having an explicit "quit" option gives git p4 a chance
to clean up, show the applied-commit summary, and do tag export.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-p4.py | diffblobblamehistory | |
| t/t9815-git-p4-submit-fail.sh | diffblobblamehistory |