Mercurial > hg

comparison tests/test-obsolete.t @ 17074:178a2e85d426

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debugobsolete: list all obsolete marker if no argument are specified
author Pierre-Yves.David@ens-lyon.org
date Thu, 07 Jun 2012 19:20:44 +0200
parents 11f26e2669aa
children 28ed1c4511ce
comparison
equal deleted inserted replaced
17073:3a79a5682af1 17074:178a2e85d426
14 14
15 Killing a single changeset without replacement 15 Killing a single changeset without replacement
16 16
17 $ mkcommit kill_me 17 $ mkcommit kill_me
18 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar 18 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
19 $ hg debugobsolete
20 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 {'date': '0 0', 'user': 'babar'}
19 $ cd .. 21 $ cd ..
20 22
21 Killing a single changeset with replacement 23 Killing a single changeset with replacement
22 24
23 $ hg init tmpb 25 $ hg init tmpb
28 $ hg up "desc('b')" 30 $ hg up "desc('b')"
29 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 31 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
30 $ mkcommit new_c 32 $ mkcommit new_c
31 created new head 33 created new head
32 $ hg debugobsolete `getid original_c` `getid new_c` -d '56 12' 34 $ hg debugobsolete `getid original_c` `getid new_c` -d '56 12'
35 $ hg debugobsolete
36 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
33 37
34 do it again (it read the obsstore before adding new changeset) 38 do it again (it read the obsstore before adding new changeset)
35 39
36 $ hg up '.^' 40 $ hg up '.^'
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 41 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
38 $ mkcommit new_2_c 42 $ mkcommit new_2_c
39 created new head 43 created new head
40 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` 44 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
45 $ hg debugobsolete
46 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
47 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
41 48
42 Register two markers with a missing node 49 Register two markers with a missing node
43 50
44 $ hg up '.^' 51 $ hg up '.^'
45 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 52 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
46 $ mkcommit new_3_c 53 $ mkcommit new_3_c
47 created new head 54 created new head
48 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 55 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
49 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` 56 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
57 $ hg debugobsolete
58 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
59 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
60 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
61 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}