##// END OF EJS Templates
tests: unify test-rename-merge1
Adrian Buehlmann -
r12298:f254204d default
parent child Browse files
Show More
@@ -1,27 +1,77 b''
1 #!/bin/sh
1 $ hg init
2
3 $ echo "[merge]" >> .hg/hgrc
4 $ echo "followcopies = 1" >> .hg/hgrc
5
6 $ echo foo > a
7 $ echo foo > a2
8 $ hg add a a2
9 $ hg ci -m "start"
10
11 $ hg mv a b
12 $ hg mv a2 b2
13 $ hg ci -m "rename"
14
15 $ hg co 0
16 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
17
18 $ echo blahblah > a
19 $ echo blahblah > a2
20 $ hg mv a2 c2
21 $ hg ci -m "modify"
22 created new head
2 23
3 mkdir t
4 cd t
5 hg init
6 echo "[merge]" >> .hg/hgrc
7 echo "followcopies = 1" >> .hg/hgrc
8 echo foo > a
9 echo foo > a2
10 hg add a a2
11 hg ci -m "start"
12 hg mv a b
13 hg mv a2 b2
14 hg ci -m "rename"
15 echo "checkout"
16 hg co 0
17 echo blahblah > a
18 echo blahblah > a2
19 hg mv a2 c2
20 hg ci -m "modify"
21 echo "merge"
22 hg merge -y --debug
23 hg status -AC
24 cat b
25 hg ci -m "merge"
26 hg debugindex .hg/store/data/b.i
27 hg debugrename b
24 $ hg merge -y --debug
25 searching for copies back to rev 1
26 unmatched files in local:
27 c2
28 unmatched files in other:
29 b
30 b2
31 all copies found (* = to merge, ! = divergent):
32 c2 -> a2 !
33 b -> a *
34 b2 -> a2 !
35 checking for directory renames
36 a2: divergent renames -> dr
37 resolving manifests
38 overwrite None partial False
39 ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c
40 a: remote moved to b -> m
41 b2: remote created -> g
42 preserving a for resolve of b
43 removing a
44 updating: a 1/3 files (33.33%)
45 picked tool 'internal:merge' for b (binary False symlink False)
46 merging a and b to b
47 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
48 premerge successful
49 updating: a2 2/3 files (66.67%)
50 warning: detected divergent renames of a2 to:
51 c2
52 b2
53 updating: b2 3/3 files (100.00%)
54 getting b2
55 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
56 (branch merge, don't forget to commit)
57
58 $ hg status -AC
59 M b
60 a
61 M b2
62 R a
63 C c2
64
65 $ cat b
66 blahblah
67
68 $ hg ci -m "merge"
69
70 $ hg debugindex .hg/store/data/b.i
71 rev offset length base linkrev nodeid p1 p2
72 0 0 67 0 1 57eacc201a7f 000000000000 000000000000
73 1 67 72 1 3 4727ba907962 000000000000 57eacc201a7f
74
75 $ hg debugrename b
76 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66
77
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now