equal
deleted
inserted
replaced
45 added 1 changesets with 1 changes to 1 files |
45 added 1 changesets with 1 changes to 1 files |
46 $ hg up -q '.^' |
46 $ hg up -q '.^' |
47 $ mkcommit new |
47 $ mkcommit new |
48 created new head |
48 created new head |
49 $ hg debugobsolete --flags 1 `getid old` `getid new` |
49 $ hg debugobsolete --flags 1 `getid old` `getid new` |
|
50 1 new obsolescence markers |
50 obsoleted 1 changesets |
51 obsoleted 1 changesets |
51 $ hg log -G --hidden |
52 $ hg log -G --hidden |
52 @ 71e3228bffe1 (draft) add new |
53 @ 71e3228bffe1 (draft) add new |
53 | |
54 | |
54 | x c70b08862e08 (draft) add old |
55 | x c70b08862e08 (draft) add old |
188 $ mkcommit desc1 |
189 $ mkcommit desc1 |
189 $ hg up -q '.^' |
190 $ hg up -q '.^' |
190 $ mkcommit desc2 |
191 $ mkcommit desc2 |
191 created new head |
192 created new head |
192 $ hg debugobsolete `getid old` `getid new` |
193 $ hg debugobsolete `getid old` `getid new` |
|
194 1 new obsolescence markers |
193 obsoleted 1 changesets |
195 obsoleted 1 changesets |
194 $ hg log -G --hidden |
196 $ hg log -G --hidden |
195 @ 5fe37041cc2b (draft) add desc2 |
197 @ 5fe37041cc2b (draft) add desc2 |
196 | |
198 | |
197 | o a3ef1d111c5f (draft) add desc1 |
199 | o a3ef1d111c5f (draft) add desc1 |
245 $ hg -R ../remote id --debug -r tip |
247 $ hg -R ../remote id --debug -r tip |
246 c70b08862e0838ea6d7c59c85da2f1ed6c8d67da tip |
248 c70b08862e0838ea6d7c59c85da2f1ed6c8d67da tip |
247 $ hg id --debug -r tip |
249 $ hg id --debug -r tip |
248 71e3228bffe1886550777233d6c97bb5a6b2a650 tip |
250 71e3228bffe1886550777233d6c97bb5a6b2a650 tip |
249 $ hg debugobsolete c70b08862e0838ea6d7c59c85da2f1ed6c8d67da 71e3228bffe1886550777233d6c97bb5a6b2a650 |
251 $ hg debugobsolete c70b08862e0838ea6d7c59c85da2f1ed6c8d67da 71e3228bffe1886550777233d6c97bb5a6b2a650 |
|
252 1 new obsolescence markers |
250 $ hg log -G --hidden |
253 $ hg log -G --hidden |
251 @ 71e3228bffe1 (draft) add new |
254 @ 71e3228bffe1 (draft) add new |
252 | |
255 | |
253 o b4952fcf48cf (public) add base |
256 o b4952fcf48cf (public) add base |
254 |
257 |
299 $ cd local |
302 $ cd local |
300 $ hg up -q '.^' |
303 $ hg up -q '.^' |
301 $ mkcommit new-unrelated |
304 $ mkcommit new-unrelated |
302 created new head |
305 created new head |
303 $ hg debugobsolete `getid old` |
306 $ hg debugobsolete `getid old` |
|
307 1 new obsolescence markers |
304 obsoleted 1 changesets |
308 obsoleted 1 changesets |
305 $ hg log -G --hidden |
309 $ hg log -G --hidden |
306 @ 350a93b716be (draft) add new-unrelated |
310 @ 350a93b716be (draft) add new-unrelated |
307 | |
311 | |
308 | x c70b08862e08 (draft) add old |
312 | x c70b08862e08 (draft) add old |