equal
deleted
inserted
replaced
174 $ hg resolve A |
174 $ hg resolve A |
175 merging A |
175 merging A |
176 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
176 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
177 [1] |
177 [1] |
178 |
178 |
|
179 An unresolved conflict will pin the obsolete revision |
|
180 |
|
181 $ hg log -G -Tcompact |
|
182 % 5[tip] 071d07019675 1970-01-01 00:00 +0000 test |
|
183 | F |
|
184 | |
|
185 o 4 ae36e8e3dfd7 1970-01-01 00:00 +0000 test |
|
186 | E |
|
187 | |
|
188 o 3:0 46b37eabc604 1970-01-01 00:00 +0000 test |
|
189 | D |
|
190 | |
|
191 | @ 2 965c486023db 1970-01-01 00:00 +0000 test |
|
192 | | C |
|
193 | | |
|
194 | o 1 27547f69f254 1970-01-01 00:00 +0000 test |
|
195 |/ B |
|
196 | |
|
197 o 0 4a2df7238c3b 1970-01-01 00:00 +0000 test |
|
198 A |
|
199 |
|
200 |
|
201 But resolving the conflicts will unpin it |
|
202 |
|
203 $ hg resolve -m A |
|
204 (no more unresolved files) |
|
205 $ hg log -G -Tcompact |
|
206 o 4[tip] ae36e8e3dfd7 1970-01-01 00:00 +0000 test |
|
207 | E |
|
208 | |
|
209 o 3:0 46b37eabc604 1970-01-01 00:00 +0000 test |
|
210 | D |
|
211 | |
|
212 | @ 2 965c486023db 1970-01-01 00:00 +0000 test |
|
213 | | C |
|
214 | | |
|
215 | o 1 27547f69f254 1970-01-01 00:00 +0000 test |
|
216 |/ B |
|
217 | |
|
218 o 0 4a2df7238c3b 1970-01-01 00:00 +0000 test |
|
219 A |
|
220 |
179 $ hg up -C -q . |
221 $ hg up -C -q . |
180 |
222 |
181 $ cd .. |
223 $ cd .. |