equal
deleted
inserted
replaced
57 adding changesets |
57 adding changesets |
58 adding manifests |
58 adding manifests |
59 adding file changes |
59 adding file changes |
60 added 2 changesets with 2 changes to 2 files |
60 added 2 changesets with 2 changes to 2 files |
61 1 new obsolescence markers |
61 1 new obsolescence markers |
|
62 changegroup hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
62 b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
63 b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
63 changegroup hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
64 updating to branch default |
64 updating to branch default |
65 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
65 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
66 $ hg -R other log -G |
66 $ hg -R other log -G |
67 @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
67 @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
68 | |
68 | |
80 adding changesets |
80 adding changesets |
81 adding manifests |
81 adding manifests |
82 adding file changes |
82 adding file changes |
83 added 1 changesets with 1 changes to 1 files (+1 heads) |
83 added 1 changesets with 1 changes to 1 files (+1 heads) |
84 1 new obsolescence markers |
84 1 new obsolescence markers |
|
85 changegroup hook: HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
85 b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
86 b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
86 changegroup hook: HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
87 (run 'hg heads' to see heads, 'hg merge' to merge) |
87 (run 'hg heads' to see heads, 'hg merge' to merge) |
88 $ hg -R other log -G |
88 $ hg -R other log -G |
89 o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F |
89 o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F |
90 | |
90 | |
91 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
91 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
154 |
154 |
155 push |
155 push |
156 $ hg -R main push other --rev eea13746799a --bookmark book_eea1 |
156 $ hg -R main push other --rev eea13746799a --bookmark book_eea1 |
157 pushing to other |
157 pushing to other |
158 searching for changes |
158 searching for changes |
|
159 changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_SOURCE=push HG_URL=push |
159 b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_URL=push |
160 b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_URL=push |
160 changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_SOURCE=push HG_URL=push |
|
161 remote: adding changesets |
161 remote: adding changesets |
162 remote: adding manifests |
162 remote: adding manifests |
163 remote: adding file changes |
163 remote: adding file changes |
164 remote: added 1 changesets with 0 changes to 0 files (-1 heads) |
164 remote: added 1 changesets with 0 changes to 0 files (-1 heads) |
165 remote: 1 new obsolescence markers |
165 remote: 1 new obsolescence markers |
187 adding manifests |
187 adding manifests |
188 adding file changes |
188 adding file changes |
189 added 1 changesets with 1 changes to 1 files (+1 heads) |
189 added 1 changesets with 1 changes to 1 files (+1 heads) |
190 1 new obsolescence markers |
190 1 new obsolescence markers |
191 updating bookmark book_02de |
191 updating bookmark book_02de |
|
192 changegroup hook: HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_SOURCE=pull HG_URL=ssh://user@dummy/main |
192 b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=ssh://user@dummy/main |
193 b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=ssh://user@dummy/main |
193 changegroup hook: HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_SOURCE=pull HG_URL=ssh://user@dummy/main |
|
194 (run 'hg heads' to see heads, 'hg merge' to merge) |
194 (run 'hg heads' to see heads, 'hg merge' to merge) |
195 $ hg -R other debugobsolete |
195 $ hg -R other debugobsolete |
196 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
196 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
197 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
197 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
198 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
198 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
210 adding manifests |
210 adding manifests |
211 adding file changes |
211 adding file changes |
212 added 1 changesets with 1 changes to 1 files (+1 heads) |
212 added 1 changesets with 1 changes to 1 files (+1 heads) |
213 1 new obsolescence markers |
213 1 new obsolescence markers |
214 updating bookmark book_42cc |
214 updating bookmark book_42cc |
|
215 changegroup hook: HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ |
215 b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ |
216 b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ |
216 changegroup hook: HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ |
|
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: changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 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_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 |
238 remote: b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 |
238 remote: changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 |
|
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 | |