equal
deleted
inserted
replaced
156 |
156 |
157 push |
157 push |
158 $ hg -R main push other --rev eea13746799a --bookmark book_eea1 |
158 $ hg -R main push other --rev eea13746799a --bookmark book_eea1 |
159 pushing to other |
159 pushing to other |
160 searching for changes |
160 searching for changes |
161 b2x-transactionclose hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=push HG_URL=push |
161 b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=push HG_URL=push |
162 changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
162 changegroup hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
163 remote: adding changesets |
163 remote: adding changesets |
164 remote: adding manifests |
164 remote: adding manifests |
165 remote: adding file changes |
165 remote: adding file changes |
166 remote: added 1 changesets with 0 changes to 0 files (-1 heads) |
166 remote: added 1 changesets with 0 changes to 0 files (-1 heads) |
167 remote: 1 new obsolescence markers |
167 remote: 1 new obsolescence markers |
189 adding manifests |
189 adding manifests |
190 adding file changes |
190 adding file changes |
191 added 1 changesets with 1 changes to 1 files (+1 heads) |
191 added 1 changesets with 1 changes to 1 files (+1 heads) |
192 1 new obsolescence markers |
192 1 new obsolescence markers |
193 updating bookmark book_02de |
193 updating bookmark book_02de |
194 changegroup hook: HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
194 changegroup hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
195 (run 'hg heads' to see heads, 'hg merge' to merge) |
195 (run 'hg heads' to see heads, 'hg merge' to merge) |
196 $ hg -R other debugobsolete |
196 $ hg -R other debugobsolete |
197 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
197 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
198 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
198 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
199 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
199 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
211 adding manifests |
211 adding manifests |
212 adding file changes |
212 adding file changes |
213 added 1 changesets with 1 changes to 1 files (+1 heads) |
213 added 1 changesets with 1 changes to 1 files (+1 heads) |
214 1 new obsolescence markers |
214 1 new obsolescence markers |
215 updating bookmark book_42cc |
215 updating bookmark book_42cc |
216 changegroup hook: HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
216 changegroup hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
217 (run 'hg heads .' to see heads, 'hg merge' to merge) |
217 (run 'hg heads .' to see heads, 'hg merge' to merge) |
218 $ cat main-error.log |
218 $ cat main-error.log |
219 $ hg -R other debugobsolete |
219 $ hg -R other debugobsolete |
220 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
220 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
221 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
221 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
232 remote: adding manifests |
232 remote: adding manifests |
233 remote: adding file changes |
233 remote: adding file changes |
234 remote: added 1 changesets with 1 changes to 1 files |
234 remote: added 1 changesets with 1 changes to 1 files |
235 remote: 1 new obsolescence markers |
235 remote: 1 new obsolescence markers |
236 updating bookmark book_5fdd |
236 updating bookmark book_5fdd |
237 remote: b2x-transactionclose hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 |
237 remote: b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 |
238 remote: changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
238 remote: changegroup hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
239 $ hg -R other log -G |
239 $ hg -R other log -G |
240 o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C |
240 o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C |
241 | |
241 | |
242 o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B |
242 o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B |
243 | |
243 | |