equal
deleted
inserted
replaced
41 $ hg unbundle $TESTDIR/bundles/rebase.hg |
41 $ hg unbundle $TESTDIR/bundles/rebase.hg |
42 adding changesets |
42 adding changesets |
43 adding manifests |
43 adding manifests |
44 adding file changes |
44 adding file changes |
45 added 8 changesets with 7 changes to 7 files (+3 heads) |
45 added 8 changesets with 7 changes to 7 files (+3 heads) |
46 changegroup hook: HG_SOURCE=unbundle HG_URL=bundle:*/tests/bundles/rebase.hg (glob) |
46 changegroup hook: HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_URL=bundle:*/tests/bundles/rebase.hg (glob) |
47 (run 'hg heads' to see heads, 'hg merge' to merge) |
47 (run 'hg heads' to see heads, 'hg merge' to merge) |
48 |
48 |
49 $ cd .. |
49 $ cd .. |
50 |
50 |
51 Real world exchange |
51 Real world exchange |
63 adding changesets |
63 adding changesets |
64 adding manifests |
64 adding manifests |
65 adding file changes |
65 adding file changes |
66 added 2 changesets with 2 changes to 2 files |
66 added 2 changesets with 2 changes to 2 files |
67 1 new obsolescence markers |
67 1 new obsolescence markers |
68 changegroup hook: HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
68 changegroup hook: HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
69 updating to branch default |
69 updating to branch default |
70 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
70 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
71 $ hg -R other log -G |
71 $ hg -R other log -G |
72 @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
72 @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
73 | |
73 | |
85 adding changesets |
85 adding changesets |
86 adding manifests |
86 adding manifests |
87 adding file changes |
87 adding file changes |
88 added 1 changesets with 1 changes to 1 files (+1 heads) |
88 added 1 changesets with 1 changes to 1 files (+1 heads) |
89 1 new obsolescence markers |
89 1 new obsolescence markers |
90 changegroup hook: HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
90 changegroup hook: HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
91 (run 'hg heads' to see heads, 'hg merge' to merge) |
91 (run 'hg heads' to see heads, 'hg merge' to merge) |
92 $ hg -R other log -G |
92 $ hg -R other log -G |
93 o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F |
93 o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F |
94 | |
94 | |
95 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
95 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
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_SOURCE=push HG_URL=push |
161 b2x-transactionclose hook: 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_SOURCE=bundle2 HG_URL=bundle2 |
162 changegroup hook: 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_SOURCE=bundle2 HG_URL=bundle2 |
194 changegroup hook: 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_SOURCE=bundle2 HG_URL=bundle2 |
216 changegroup hook: 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'} |