equal
deleted
inserted
replaced
151 | | |
151 | | |
152 | o 1:draft 'B' |
152 | o 1:draft 'B' |
153 |/ |
153 |/ |
154 o 0:draft 'A' |
154 o 0:draft 'A' |
155 |
155 |
|
156 $ cat >> .hg/hgrc << EOF |
|
157 > [experimental] |
|
158 > evolution.createmarkers=True |
|
159 > EOF |
|
160 |
|
161 When updating away from a dirty, obsolete wdir, don't complain that the old p1 |
|
162 is filtered and requires --hidden. |
|
163 |
|
164 $ echo conflict > A |
|
165 $ hg debugobsolete 071d07019675449d53b7e312c65bcf28adbbdb64 965c486023dbfdc9c32c52dc249a231882fd5c17 |
|
166 1 new obsolescence markers |
|
167 obsoleted 1 changesets |
|
168 $ hg update -r 2 --config ui.merge=internal:merge --merge |
|
169 merging A |
|
170 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
|
171 1 files updated, 0 files merged, 1 files removed, 1 files unresolved |
|
172 use 'hg resolve' to retry unresolved file merges |
|
173 [1] |
|
174 $ hg resolve A |
|
175 merging A |
|
176 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
|
177 [1] |
|
178 |
|
179 $ hg up -C -q . |
156 |
180 |
157 $ cd .. |
181 $ cd .. |