Mercurial > hg
view tests/bzr-definitions @ 23464:73d4f6551798
merge: add test with conflicting file and remote directory rename
Changset 88629daa727b (merge: demonstrate that directory renames can
lose local file content, 2014-12-02) should clearly have added the
reverse version of the test: where the remote side renamed a
directory, added a new file in that directory, and the local directory
added a conflicting file in the source directory. Add such a test now,
and also touch up the ones already added slightly (e.g. 'local' was a
stupid value for content that can be on either side of a merge).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 03 Dec 2014 10:01:24 -0800 |
parents | aa9385f983fa |
children | 89872688893f |
line wrap: on
line source
# this file holds the definitions that are used in various bzr tests "$TESTDIR/hghave" bzr || exit 80 TERM=dumb; export TERM echo '[extensions]' >> $HGRCPATH echo 'convert = ' >> $HGRCPATH glog() { hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@" } manifest() { echo "% manifest of $2" hg -R $1 manifest -v -r $2 }