259 |
259 |
260 Actual rewind |
260 Actual rewind |
261 ````````````` |
261 ````````````` |
262 |
262 |
263 $ hg rewind --hidden --to 'desc("c_B0")' --as-divergence |
263 $ hg rewind --hidden --to 'desc("c_B0")' --as-divergence |
264 2 new content-divergent changesets |
|
265 rewinded to 1 changesets |
264 rewinded to 1 changesets |
266 $ hg debugobsolete |
265 $ hg debugobsolete |
267 7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
266 7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
268 7e594302a05d3769b27be88fc3cdfd39d7498498 48acf2c0d9c8961859ce9a913671eb2adc9b057b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'} |
267 7e594302a05d3769b27be88fc3cdfd39d7498498 48acf2c0d9c8961859ce9a913671eb2adc9b057b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'} |
269 $ hg obslog --rev 'desc("c_B0")' |
268 $ hg obslog --rev 'desc("c_B0")' |
270 * 48acf2c0d9c8 (4) c_B0 |
269 o 48acf2c0d9c8 (4) c_B0 |
271 | |
270 | |
272 x 7e594302a05d (2) c_B0 |
271 x 7e594302a05d (2) c_B0 |
273 rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000) |
272 rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000) |
274 rewritten(meta, date) as 48acf2c0d9c8 using rewind by test (Thu Jan 01 00:00:01 1970 +0000) |
273 rewritten(meta, date) as 48acf2c0d9c8 using rewind by test (Thu Jan 01 00:00:01 1970 +0000) |
275 |
274 |
276 $ hg log -G |
275 $ hg log -G |
277 * changeset: 4:48acf2c0d9c8 |
276 o changeset: 4:48acf2c0d9c8 |
278 | tag: tip |
277 | tag: tip |
279 | parent: 1:579f120ba918 |
278 | parent: 1:579f120ba918 |
280 | user: test |
279 | user: test |
281 | date: Thu Jan 01 00:00:01 1970 +0000 |
280 | date: Thu Jan 01 00:00:01 1970 +0000 |
282 | instability: content-divergent |
281 | instability: content-divergent |
298 user: test |
297 user: test |
299 date: Thu Jan 01 00:00:00 1970 +0000 |
298 date: Thu Jan 01 00:00:00 1970 +0000 |
300 summary: c_ROOT |
299 summary: c_ROOT |
301 |
300 |
302 $ hg log -G --hidden |
301 $ hg log -G --hidden |
303 * changeset: 4:48acf2c0d9c8 |
302 o changeset: 4:48acf2c0d9c8 |
304 | tag: tip |
303 | tag: tip |
305 | parent: 1:579f120ba918 |
304 | parent: 1:579f120ba918 |
306 | user: test |
305 | user: test |
307 | date: Thu Jan 01 00:00:01 1970 +0000 |
306 | date: Thu Jan 01 00:00:01 1970 +0000 |
308 | instability: content-divergent |
307 | instability: content-divergent |
700 |
699 |
701 Actual rewind |
700 Actual rewind |
702 ````````````` |
701 ````````````` |
703 |
702 |
704 $ hg rewind --hidden --to 'min(desc(c_B0))' --exact |
703 $ hg rewind --hidden --to 'min(desc(c_B0))' --exact |
705 1 new orphan changesets |
|
706 rewinded to 1 changesets |
704 rewinded to 1 changesets |
707 (1 changesets obsoleted) |
705 (1 changesets obsoleted) |
708 working directory is now at 96622b0702dd |
706 working directory is now at 96622b0702dd |
709 $ hg debugobsolete |
707 $ hg debugobsolete |
710 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
708 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |