Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge8 @ 5087:1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 06 Aug 2007 09:57:23 +0200 |
parents | efbe24c7d8d9 |
children |
rev | line source |
---|---|
3389
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
1 #!/bin/sh |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
2 |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
3 # Test for changeset ba7c74081861 |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
4 # (update dirstate correctly for non-branchmerge updates) |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
5 hg init a |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
6 cd a |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
7 echo a > a |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
8 hg add a |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
9 hg commit -m a |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
10 cd .. |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
11 hg clone a b |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
12 cd a |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
13 hg mv a b |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
14 hg commit -m move |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
15 echo b >> b |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
16 hg commit -m b |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
17 cd ../b |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
18 hg pull ../a |
efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
19 hg update |