##// END OF EJS Templates
add a fix for issue 1175...
add a fix for issue 1175 If we copy a file followed by an update, it's possible for the parent manifest to no longer contain the source file of the copy, which could cause commit to fail. If this happens, we search backwares from the first parent to find the most likely original revision.

File last commit:

r5143:d4fa6baf default
r6875:0d714a48 default
Show More
test-extdiff
40 lines | 767 B | text/plain | TextLexer
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 #!/bin/sh
Thomas Arendsen Hein
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc...
r2990 echo "[extensions]" >> $HGRCPATH
echo "extdiff=" >> $HGRCPATH
Vadim Gelfer
extdiff: fix bugs. add test.
r2906
hg init a
cd a
echo a > a
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 echo b > b
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 hg add
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 # should diff cloned directories
Thomas Arendsen Hein
Don't require a diff which accepts the -N option.
r3751 hg extdiff -o -r $opt
Vadim Gelfer
extdiff: fix bugs. add test.
r2906
Thomas Arendsen Hein
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc...
r2990 echo "[extdiff]" >> $HGRCPATH
echo "cmd.falabala=echo" >> $HGRCPATH
echo "opts.falabala=diffing" >> $HGRCPATH
Vadim Gelfer
extdiff: fix bugs. add test.
r2906
hg falabala
hg help falabala
hg ci -d '0 0' -mtest1
echo b >> a
hg ci -d '1 0' -mtest2
Thomas Arendsen Hein
Remove trailing spaces, fix indentation
r5143 # should diff cloned files directly
Benoit Boissinot
fix traceback of extdiff after a merge...
r3330 hg falabala -r 0:1
# test diff during merge
hg update 0
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 echo c >> c
hg add c
Benoit Boissinot
fix traceback of extdiff after a merge...
r3330 hg ci -m "new branch" -d '1 0'
hg update -C 1
hg merge tip
Thomas Arendsen Hein
Remove trailing spaces, fix indentation
r5143 # should diff cloned file against wc file
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 hg falabala > out || echo "diff-like tools yield a non-zero exit code"
# cleanup the output since the wc is a tmp directory
sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out