diff options
author | Pete Wyckoff <pw@padd.com> | 2012-09-09 16:16:04 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-16 21:52:52 -0700 |
commit | 449bb9cf1a0c42ddf6e9b9b6fd447eda12f9bc92 (patch) | |
tree | 49219a987e9796196cab86bddfa4282899b94d24 /decorate.h | |
parent | 67b0fe2eb6b70f530be347260c3792509a900feb (diff) | |
download | git-449bb9cf1a0c42ddf6e9b9b6fd447eda12f9bc92.tar.gz git-449bb9cf1a0c42ddf6e9b9b6fd447eda12f9bc92.tar.xz |
git p4: remove submit failure options [a]pply and [w]rite
When a patch failed to apply, these interactive options offered
to:
1) apply the patch anyway, leaving reject (.rej) files around, or,
2) write the patch to a file (patch.txt)
In both cases it suggested to invoke "git p4 submit --continue",
an unimplemented option.
While manually fixing the rejects and submitting the result might
work, there are many steps that must be done to the job properly:
* apply patch
* invoke p4 add and delete
* change executable bits
* p4 sync -f renamed/copied files
* extract commit message into p4 change description and
move Jobs lines out of description section
* set changelist owner for --preserve-user
Plus the following manual sync/rebase will cause conflicts too,
which must be resolved once again.
Drop these workflows. Instead users should do a sync/rebase in
git, fix the conflicts there, and do a clean "git p4 submit".
Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'decorate.h')
0 files changed, 0 insertions, 0 deletions