Mercurial > hg
view tests/test-bad-extension.t @ 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 | e955549cd045 |
children | de23a552fc23 |
line wrap: on
line source
$ echo 'raise Exception("bit bucket overflow")' > badext.py $ abspath=`pwd`/badext.py $ cat <<EOF >> $HGRCPATH > [extensions] > gpg = > hgext.gpg = > badext = $abspath > badext2 = > EOF $ hg -q help help *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow *** failed to import extension badext2: No module named badext2 hg help [-ec] [TOPIC] show help for a given topic or a help overview