Show More
@@ -111,14 +111,16 b' and untracked in local target directory.' | |||
|
111 | 111 | BROKEN: the uncommitted file is overwritten; we should abort |
|
112 | 112 | |
|
113 | 113 | $ hg co -qC 1 |
|
114 |
$ echo |
|
|
114 | $ echo target > b/c | |
|
115 | 115 | $ hg merge 2 |
|
116 | 116 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
117 | 117 | (branch merge, don't forget to commit) |
|
118 |
$ hg st - |
|
|
118 | $ hg st -A | |
|
119 | 119 | A b/c |
|
120 | 120 | a/c |
|
121 | 121 | ? a/d |
|
122 | C b/a | |
|
123 | C b/b | |
|
122 | 124 | $ cat b/c |
|
123 | 125 | baz |
|
124 | 126 | |
@@ -128,16 +130,45 b' and committed in local target directory.' | |||
|
128 | 130 | BROKEN: the local file is overwritten; it should be merged |
|
129 | 131 | |
|
130 | 132 | $ hg co -qC 1 |
|
131 |
$ echo |
|
|
133 | $ echo target > b/c | |
|
132 | 134 | $ hg add b/c |
|
133 | 135 | $ hg commit -qm 'new file in target directory' |
|
134 | 136 | $ hg merge 2 |
|
135 | 137 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
136 | 138 | (branch merge, don't forget to commit) |
|
137 |
$ hg st - |
|
|
139 | $ hg st -A | |
|
138 | 140 | A b/c |
|
139 | 141 | a/c |
|
140 | 142 | ? a/d |
|
143 | C b/a | |
|
144 | C b/b | |
|
145 | $ cat b/c | |
|
146 | baz | |
|
147 | ||
|
148 | Remote directory rename with conflicting file added in remote target directory | |
|
149 | and committed in local source directory. | |
|
150 | ||
|
151 | BROKEN: the remote is ignored; it should be merged | |
|
152 | ||
|
153 | $ hg co -qC 2 | |
|
154 | $ rm b/c | |
|
155 | $ hg st -A | |
|
156 | ? a/d | |
|
157 | C a/a | |
|
158 | C a/b | |
|
159 | C a/c | |
|
160 | $ hg merge 5 | |
|
161 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
162 | (branch merge, don't forget to commit) | |
|
163 | $ hg st -A | |
|
164 | M b/a | |
|
165 | M b/b | |
|
166 | A b/c | |
|
167 | a/c | |
|
168 | R a/a | |
|
169 | R a/b | |
|
170 | R a/c | |
|
171 | ? a/d | |
|
141 | 172 | $ cat b/c |
|
142 | 173 | baz |
|
143 | 174 |
General Comments 0
You need to be logged in to leave comments.
Login now