##// END OF EJS Templates
commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

File last commit:

r5556:61fdf255 default
r6385:0d4e068e default
Show More
test-convert-hg-sink
57 lines | 986 B | text/plain | TextLexer
/ tests / test-convert-hg-sink
#!/bin/sh
cat >> $HGRCPATH <<EOF
[extensions]
convert=
[convert]
hg.saverev=False
EOF
hg init orig
cd orig
echo foo > foo
echo bar > bar
hg ci -qAm 'add foo and bar' -d '0 0'
hg rm foo
hg ci -m 'remove foo' -d '0 0'
mkdir foo
echo file > foo/file
hg ci -qAm 'add foo/file' -d '0 0'
hg tag -d '0 0' some-tag
hg log
cd ..
hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
cd new
hg out ../orig
echo '% dirstate should be empty:'
hg debugstate
hg parents -q
hg up -C
hg copy bar baz
echo '% put something in the dirstate:'
hg debugstate > debugstate
grep baz debugstate
echo '% add a new revision in the original repo'
cd ../orig
echo baz > baz
hg ci -qAm 'add baz'
cd ..
hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
cd new
hg out ../orig
echo '% dirstate should be the same (no output below):'
hg debugstate > new-debugstate
diff debugstate new-debugstate
echo '% no copies'
hg up -C
hg debugrename baz