Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-issue433 @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7a7d4937272b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3719
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
1 #!/bin/sh
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
2 # http://www.selenic.com/mercurial/bts/issue433
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
3
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
4 hg init a
4659
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3719
diff changeset
5 cd a
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3719
diff changeset
6 echo a > a
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3719
diff changeset
7 hg commit -Ama
3719
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
8
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
9 hg parents -r 0 doesnotexist
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
10 true