equal
deleted
inserted
replaced
72 $ hg update -q 0 |
72 $ hg update -q 0 |
73 $ mkcommit B1 |
73 $ mkcommit B1 |
74 created new head |
74 created new head |
75 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
75 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
76 obsoleted 1 changesets |
76 obsoleted 1 changesets |
|
77 1 new orphan changesets |
77 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` |
78 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` |
78 obsoleted 1 changesets |
79 obsoleted 1 changesets |
79 $ hg log -G --hidden |
80 $ hg log -G --hidden |
80 @ f6298a8ac3a4 (draft): B1 |
81 @ f6298a8ac3a4 (draft): B1 |
81 | |
82 | |
161 $ hg update -q 0 |
162 $ hg update -q 0 |
162 $ mkcommit B1 |
163 $ mkcommit B1 |
163 created new head |
164 created new head |
164 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
165 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
165 obsoleted 1 changesets |
166 obsoleted 1 changesets |
|
167 1 new orphan changesets |
166 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` |
168 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` |
167 obsoleted 1 changesets |
169 obsoleted 1 changesets |
168 $ hg log -G --hidden |
170 $ hg log -G --hidden |
169 @ f6298a8ac3a4 (draft): B1 |
171 @ f6298a8ac3a4 (draft): B1 |
170 | |
172 | |
216 remote: adding manifests |
218 remote: adding manifests |
217 remote: adding file changes |
219 remote: adding file changes |
218 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
220 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
219 remote: 1 new obsolescence markers |
221 remote: 1 new obsolescence markers |
220 remote: obsoleted 1 changesets |
222 remote: obsoleted 1 changesets |
|
223 remote: 1 new orphan changesets |
221 ## post push state |
224 ## post push state |
222 # obstore: main |
225 # obstore: main |
223 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
226 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
224 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
227 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
225 # obstore: pushdest |
228 # obstore: pushdest |
232 adding manifests |
235 adding manifests |
233 adding file changes |
236 adding file changes |
234 added 1 changesets with 1 changes to 1 files (+1 heads) |
237 added 1 changesets with 1 changes to 1 files (+1 heads) |
235 1 new obsolescence markers |
238 1 new obsolescence markers |
236 obsoleted 1 changesets |
239 obsoleted 1 changesets |
|
240 1 new orphan changesets |
237 new changesets e5ea8f9c7314 |
241 new changesets e5ea8f9c7314 |
238 (run 'hg heads' to see heads, 'hg merge' to merge) |
242 (run 'hg heads' to see heads, 'hg merge' to merge) |
239 ## post pull state |
243 ## post pull state |
240 # obstore: main |
244 # obstore: main |
241 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
245 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |