Show More
@@ -16,6 +16,8 b' this is also case for issue3370.' | |||||
16 |
|
16 | |||
17 | $ echo a > a |
|
17 | $ echo a > a | |
18 | $ hg add a |
|
18 | $ hg add a | |
|
19 | $ echo b > b | |||
|
20 | $ hg add b | |||
19 | $ hg commit -m '#0' |
|
21 | $ hg commit -m '#0' | |
20 | $ hg tag -l A |
|
22 | $ hg tag -l A | |
21 | $ hg rename a tmp |
|
23 | $ hg rename a tmp | |
@@ -33,6 +35,7 b' this is also case for issue3370.' | |||||
33 | $ hg status -A |
|
35 | $ hg status -A | |
34 | M A |
|
36 | M A | |
35 | R a |
|
37 | R a | |
|
38 | C b | |||
36 | C x |
|
39 | C x | |
37 |
|
40 | |||
38 | $ hg update -q --clean 1 |
|
41 | $ hg update -q --clean 1 | |
@@ -40,6 +43,7 b' this is also case for issue3370.' | |||||
40 | $ hg status -A |
|
43 | $ hg status -A | |
41 | M x |
|
44 | M x | |
42 | C A |
|
45 | C A | |
|
46 | C b | |||
43 | $ hg commit -m '(D)' |
|
47 | $ hg commit -m '(D)' | |
44 | $ hg tag -l D |
|
48 | $ hg tag -l D | |
45 |
|
49 | |||
@@ -64,6 +68,7 b' additional test for issue3452:' | |||||
64 |
|
68 | |||
65 | $ hg update -q --clean C |
|
69 | $ hg update -q --clean C | |
66 | $ echo "modify 'a' at (E)" > a |
|
70 | $ echo "modify 'a' at (E)" > a | |
|
71 | $ echo "modify 'b' at (E)" > b | |||
67 | $ hg commit -m '(E)' |
|
72 | $ hg commit -m '(E)' | |
68 | created new head |
|
73 | created new head | |
69 | $ hg tag -l E |
|
74 | $ hg tag -l E | |
@@ -77,10 +82,45 b' additional test for issue3452:' | |||||
77 | $ hg status -A |
|
82 | $ hg status -A | |
78 | M A |
|
83 | M A | |
79 | a |
|
84 | a | |
|
85 | M b | |||
80 | C x |
|
86 | C x | |
81 | $ cat A |
|
87 | $ cat A | |
82 | modify 'a' at (E) |
|
88 | modify 'a' at (E) | |
83 |
|
89 | |||
|
90 | test also the case that (B) is recorded after (C), to prevent | |||
|
91 | regression by changes in the future. | |||
|
92 | ||||
|
93 | to avoid unexpected (successful) behavior by filelog unification, | |||
|
94 | target file is not 'a'/'A' but 'b'/'B' in this case. | |||
|
95 | ||||
|
96 | $ hg update -q --clean A | |||
|
97 | $ hg rename b tmp | |||
|
98 | $ hg rename tmp B | |||
|
99 | $ hg commit -m '(B1)' | |||
|
100 | created new head | |||
|
101 | $ hg tag -l B1 | |||
|
102 | ||||
|
103 | $ hg merge -q C | |||
|
104 | $ hg status -A | |||
|
105 | M x | |||
|
106 | C B | |||
|
107 | C a | |||
|
108 | $ hg commit -m '(D1)' | |||
|
109 | $ hg tag -l D1 | |||
|
110 | ||||
|
111 | $ echo "modify 'B' at (F1)" > B | |||
|
112 | $ hg commit -m '(F1)' | |||
|
113 | $ hg tag -l F1 | |||
|
114 | ||||
|
115 | $ hg merge -q --tool internal:other E | |||
|
116 | $ hg status -A | |||
|
117 | M B | |||
|
118 | b | |||
|
119 | M a | |||
|
120 | C x | |||
|
121 | $ cat B | |||
|
122 | modify 'b' at (E) | |||
|
123 | ||||
84 | $ cd .. |
|
124 | $ cd .. | |
85 |
|
125 | |||
86 | (2) colliding file is not related to collided file |
|
126 | (2) colliding file is not related to collided file |
General Comments 0
You need to be logged in to leave comments.
Login now