diff options
| author | Ciaran Jessup <ciaranj@gmail.com> | 2011-05-01 23:16:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-01 15:56:05 -0700 |
| commit | 0a0ec7bd66786bcc2204f299f6c993db19d1f53c (patch) | |
| tree | e131b89d840ecd51533fd54f2e96aa67cd6f538c /git-mergetool--lib.sh | |
| parent | ec014eac0e9e6f30cbbca616090fa2ecf74797e7 (diff) | |
| download | git-0a0ec7bd66786bcc2204f299f6c993db19d1f53c.tar.gz | |
Pass empty file to p4merge where no base is suitable.
Modify the p4merge client command to pass a reference to an empty file
instead of the local file when no base revision available.
In the situation where a merge tries to add a file from one branch
into a branch that already contains that file (by name), p4merge
currently seems to have successfully automatically resolved the
'conflict' when it is opened (correctly if the files differed by
just whitespace for example) but leaves the save button disabled. This
means the user of the p4merge client cannot commit the resolved
changes back to disk and merely exits, leaving the original
(merge-conflicted) file intact on the disk.
Provide an empty base file to p4merge so that it leaves the save
button enabled. This will allow saving of the auto-resolution to
disk.
Signed-off-by: Ciaran Jessup <ciaranj@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index fb3f52ba25..4db9212331 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -258,12 +258,9 @@ run_merge_tool () { ;; p4merge) if merge_mode; then - touch "$BACKUP" - if $base_present; then - "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" - else - "$merge_tool_path" "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED" - fi + touch "$BACKUP" + $base_present || >"$BASE" + "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" check_unchanged else "$merge_tool_path" "$LOCAL" "$REMOTE" |