equal
deleted
inserted
replaced
48 $ hg up 'desc("ROOT")' |
48 $ hg up 'desc("ROOT")' |
49 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
49 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
50 $ mkcommit c_B0 |
50 $ mkcommit c_B0 |
51 created new head |
51 created new head |
52 $ hg debugobsolete `getid 'desc("c_A0")'` `getid 'desc("c_A1")'` |
52 $ hg debugobsolete `getid 'desc("c_A0")'` `getid 'desc("c_A1")'` |
|
53 1 new obsolescence markers |
53 obsoleted 1 changesets |
54 obsoleted 1 changesets |
54 $ hg log -G --hidden -v |
55 $ hg log -G --hidden -v |
55 @ 3:e5d7dda7cd28 c_B0 |
56 @ 3:e5d7dda7cd28 c_B0 |
56 | |
57 | |
57 | o 2:7f6b0a6f5c25 c_A1 |
58 | o 2:7f6b0a6f5c25 c_A1 |
80 $ hg up 'desc("ROOT")' |
81 $ hg up 'desc("ROOT")' |
81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
82 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
82 $ mkcommit c_B1 |
83 $ mkcommit c_B1 |
83 created new head |
84 created new head |
84 $ hg debugobsolete `getid 'desc("c_B0")'` `getid 'desc("c_B1")'` |
85 $ hg debugobsolete `getid 'desc("c_B0")'` `getid 'desc("c_B1")'` |
|
86 1 new obsolescence markers |
85 obsoleted 1 changesets |
87 obsoleted 1 changesets |
86 $ hg log -G |
88 $ hg log -G |
87 @ 4:391a2bf12b1b c_B1 |
89 @ 4:391a2bf12b1b c_B1 |
88 | |
90 | |
89 | o 2:7f6b0a6f5c25 c_A1 |
91 | o 2:7f6b0a6f5c25 c_A1 |
109 client side: create a marker between two common changesets |
111 client side: create a marker between two common changesets |
110 (client is not aware of the server activity yet) |
112 (client is not aware of the server activity yet) |
111 |
113 |
112 $ cd client |
114 $ cd client |
113 $ hg debugobsolete `getid 'desc("c_A1")'` `getid 'desc("c_B0")'` |
115 $ hg debugobsolete `getid 'desc("c_A1")'` `getid 'desc("c_B0")'` |
|
116 1 new obsolescence markers |
114 obsoleted 1 changesets |
117 obsoleted 1 changesets |
115 $ hg log -G |
118 $ hg log -G |
116 @ 3:e5d7dda7cd28 c_B0 |
119 @ 3:e5d7dda7cd28 c_B0 |
117 | |
120 | |
118 o 0:e82fb8d02bbf ROOT |
121 o 0:e82fb8d02bbf ROOT |
535 > username=test |
538 > username=test |
536 > EOF |
539 > EOF |
537 $ cd repo-a |
540 $ cd repo-a |
538 $ hg debugbuilddag .. |
541 $ hg debugbuilddag .. |
539 $ hg debugobsolete `getid tip` |
542 $ hg debugobsolete `getid tip` |
|
543 1 new obsolescence markers |
540 obsoleted 1 changesets |
544 obsoleted 1 changesets |
541 $ cd ../ |
545 $ cd ../ |
542 $ hg clone --pull repo-a repo-b |
546 $ hg clone --pull repo-a repo-b |
543 requesting all changes |
547 requesting all changes |
544 adding changesets |
548 adding changesets |