Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-copy-move-merge @ 5059:8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 02 Aug 2007 12:29:10 -0500 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
5058:a3d6de2838de | 5059:8d9bdcbb2b18 |
---|---|
1 #!/bin/sh | |
2 | |
3 mkdir t | |
4 cd t | |
5 hg init | |
6 | |
7 echo 1 > a | |
8 hg ci -qAm "first" -d "1000000 0" | |
9 | |
10 hg cp a b | |
11 hg mv a c | |
12 echo 2 >> b | |
13 echo 2 >> c | |
14 | |
15 hg ci -qAm "second" -d "1000000 0" | |
16 | |
17 hg co -C 0 | |
18 | |
19 echo 0 > a | |
20 echo 1 >> a | |
21 | |
22 hg ci -qAm "other" -d "1000000 0" | |
23 | |
24 hg merge --debug | |
25 | |
26 echo "-- b --" | |
27 cat b | |
28 | |
29 echo "-- c --" | |
30 cat c |