Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simple-update @ 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 | ad3d5b4367cb |
children |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
1 #!/bin/sh |
331 | 2 |
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
3 set -e |
331 | 4 |
5 mkdir test | |
6 cd test | |
7 echo foo>foo | |
8 hg init | |
9 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
547
diff
changeset
|
10 hg commit -m "1" |
331 | 11 hg verify |
12 | |
485 | 13 hg clone . ../branch |
14 cd ../branch | |
331 | 15 hg co |
16 echo bar>>foo | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
547
diff
changeset
|
17 hg commit -m "2" |
331 | 18 |
19 cd ../test | |
20 hg pull ../branch | |
21 hg verify | |
22 hg co | |
23 cat foo | |
3736 | 24 hg manifest --debug |