Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-bad-extension @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | efe6f92c0847 |
children |
rev | line source |
---|---|
3011
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 #!/bin/sh |
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
4139
efe6f92c0847
test-bad-extension: avoid printing the file name
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3990
diff
changeset
|
3 echo 'raise Exception("bit bucket overflow")' > badext.py |
3011
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 abspath=`pwd`/badext.py |
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
6 echo '[extensions]' >> $HGRCPATH |
3990
96e21337dc03
Improved error message for extensions overriding commands (with test):
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3011
diff
changeset
|
7 echo "gpg =" >> $HGRCPATH |
96e21337dc03
Improved error message for extensions overriding commands (with test):
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3011
diff
changeset
|
8 echo "hgext.gpg =" >> $HGRCPATH |
3011
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
9 echo "badext = $abspath" >> $HGRCPATH |
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 hg -q help help |