Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-debugrename @ 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 5a088ac232e6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4637
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
1 #!/bin/sh
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
2
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
3 hg init
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
4 echo a > a
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
5 hg ci -Am t
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
6
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
7 hg mv a b
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
8 hg ci -Am t1
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
9 hg debugrename b
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
10
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
11 hg mv b a
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
12 hg ci -Am t2
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
13 hg debugrename a
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
14
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
15 echo % test with --rev
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
16 hg debugrename --rev 1 b
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
17