Mercurial > hg > mercurial-crew-with-dirclash

comparison hgmerge @ 830:ca080d28d0af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If rejects are empty after using the editor, merge with diff+patch was ok.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 04 Aug 2005 17:23:31 +0100
parents 764b0350acb8
children 232d0616a80a
comparison
equal deleted inserted replaced
829:764b0350acb8 830:ca080d28d0af
73 73
74 diff -u "$BASE" "$OTHER" > "$HGTMP/diff" 74 diff -u "$BASE" "$OTHER" > "$HGTMP/diff"
75 if patch "$LOCAL" < "$HGTMP/diff"; then 75 if patch "$LOCAL" < "$HGTMP/diff"; then
76 cleanup_exit 0 76 cleanup_exit 0
77 else 77 else
78 $EDITOR "$LOCAL" "$LOCAL.rej" 78 # If rejects are empty after using the editor, merge was ok
79 $EDITOR "$LOCAL" "$LOCAL.rej" && test -s "$LOCAL.rej" || cleanup_exit 0
79 fi 80 fi
80 cleanup_exit 1 81 cleanup_exit 1
81 fi 82 fi
82 83
83 echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!" 84 echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!"