test-imerge
81 lines
| 1.0 KiB
| text/plain
|
TextLexer
/ tests / test-imerge
|
r5044 | #!/bin/sh | ||
echo "[extensions]" >> $HGRCPATH | ||||
echo "imerge=" >> $HGRCPATH | ||||
HGMERGE=true | ||||
export HGMERGE | ||||
hg init base | ||||
cd base | ||||
echo foo > foo | ||||
echo bar > bar | ||||
hg ci -Am0 -d '0 0' | ||||
|
r5109 | hg mv foo foo2 | ||
echo foo >> foo2 | ||||
|
r5044 | hg ci -m1 -d '1 0' | ||
hg up -C 0 | ||||
echo bar >> foo | ||||
echo bar >> bar | ||||
hg ci -m2 -d '2 0' | ||||
echo % start imerge | ||||
hg imerge | ||||
|
r5109 | cat foo2 | ||
|
r5044 | cat bar | ||
|
r5111 | echo % status -v | ||
hg -v imerge st | ||||
|
r5044 | |||
|
r5109 | echo % next | ||
hg imerge next | ||||
|
r6363 | echo % resolve and unresolve | ||
hg imerge resolve foo | ||||
hg -v imerge st | ||||
hg imerge unresolve foo | ||||
hg -v imerge st | ||||
|
r5044 | echo % merge next | ||
|
r5109 | hg --traceback imerge | ||
|
r5044 | |||
echo % unresolve | ||||
hg imerge unres foo | ||||
echo % merge foo | ||||
hg imerge merge foo | ||||
echo % save | ||||
|
r5109 | echo foo > foo2 | ||
|
r5044 | hg imerge save ../savedmerge | ||
|
r6362 | echo % merge auto | ||
hg up -C 1 | ||||
hg --traceback imerge --auto | ||||
cat foo2 | ||||
|
r5044 | echo % load | ||
hg up -C 0 | ||||
hg imerge --traceback load ../savedmerge | ||||
|
r5109 | cat foo2 | ||
|
r5044 | |||
hg ci -m'merged' -d '3 0' | ||||
hg tip -v | ||||
|
r5242 | echo % nothing to merge -- tip | ||
hg imerge | ||||
hg up 0 | ||||
|
r5044 | echo % nothing to merge | ||
hg imerge | ||||
|
r6213 | cd .. | ||
hg -q clone -r 0 base clone | ||||
cd clone | ||||
echo % load unknown parent | ||||
hg imerge load ../savedmerge | ||||
|
r5044 | exit 0 | ||