mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
cec92b2bd7
- files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff
39 lines
617 B
Bash
Executable File
39 lines
617 B
Bash
Executable File
#!/bin/sh
|
|
|
|
echo "[extensions]" >> $HGRCPATH
|
|
echo "extdiff=" >> $HGRCPATH
|
|
|
|
hg init a
|
|
cd a
|
|
echo a > a
|
|
hg add
|
|
diff -N /dev/null /dev/null 2> /dev/null
|
|
if [ $? -ne 0 ]; then
|
|
opt="-p gdiff"
|
|
fi
|
|
hg extdiff -o -Nr $opt
|
|
|
|
echo "[extdiff]" >> $HGRCPATH
|
|
echo "cmd.falabala=echo" >> $HGRCPATH
|
|
echo "opts.falabala=diffing" >> $HGRCPATH
|
|
|
|
hg falabala
|
|
|
|
hg help falabala
|
|
|
|
hg ci -d '0 0' -mtest1
|
|
|
|
echo b >> a
|
|
hg ci -d '1 0' -mtest2
|
|
|
|
hg falabala -r 0:1
|
|
|
|
# test diff during merge
|
|
hg update 0
|
|
echo b >> b
|
|
hg add b
|
|
hg ci -m "new branch" -d '1 0'
|
|
hg update -C 1
|
|
hg merge tip
|
|
hg falabala || echo "diff-like tools yield a non-zero exit code"
|