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 b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
62 changegroup hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
63 changegroup hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
63 updating to branch default |
64 updating to branch default |
64 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 |
65 $ hg -R other log -G |
66 $ hg -R other log -G |
66 @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
67 @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
79 adding changesets |
80 adding changesets |
80 adding manifests |
81 adding manifests |
81 adding file changes |
82 adding file changes |
82 added 1 changesets with 1 changes to 1 files (+1 heads) |
83 added 1 changesets with 1 changes to 1 files (+1 heads) |
83 1 new obsolescence markers |
84 1 new obsolescence markers |
|
85 b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
84 changegroup hook: HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
86 changegroup hook: HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
85 (run 'hg heads' to see heads, 'hg merge' to merge) |
87 (run 'hg heads' to see heads, 'hg merge' to merge) |
86 $ hg -R other log -G |
88 $ hg -R other log -G |
87 o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F |
89 o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F |
88 | |
90 | |
98 |
100 |
99 $ hg -R main phase --public 24b6387c8c8c |
101 $ hg -R main phase --public 24b6387c8c8c |
100 $ hg -R other pull -r 24b6387c8c8c |
102 $ hg -R other pull -r 24b6387c8c8c |
101 pulling from $TESTTMP/main (glob) |
103 pulling from $TESTTMP/main (glob) |
102 no changes found |
104 no changes found |
|
105 b2x-transactionclose hook: HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
103 $ hg -R other log -G |
106 $ hg -R other log -G |
104 o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
107 o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
105 | |
108 | |
106 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
109 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
107 |/ |
110 |/ |
114 pull empty |
117 pull empty |
115 |
118 |
116 $ hg -R other pull -r 24b6387c8c8c |
119 $ hg -R other pull -r 24b6387c8c8c |
117 pulling from $TESTTMP/main (glob) |
120 pulling from $TESTTMP/main (glob) |
118 no changes found |
121 no changes found |
|
122 b2x-transactionclose hook: HG_NEW_OBSMARKERS=0 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
119 $ hg -R other log -G |
123 $ hg -R other log -G |
120 o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
124 o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
121 | |
125 | |
122 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
126 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
123 |/ |
127 |/ |
183 adding manifests |
187 adding manifests |
184 adding file changes |
188 adding file changes |
185 added 1 changesets with 1 changes to 1 files (+1 heads) |
189 added 1 changesets with 1 changes to 1 files (+1 heads) |
186 1 new obsolescence markers |
190 1 new obsolescence markers |
187 updating bookmark book_02de |
191 updating bookmark book_02de |
|
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 |
188 changegroup hook: HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_SOURCE=pull HG_URL=ssh://user@dummy/main |
193 changegroup hook: HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_SOURCE=pull HG_URL=ssh://user@dummy/main |
189 (run 'hg heads' to see heads, 'hg merge' to merge) |
194 (run 'hg heads' to see heads, 'hg merge' to merge) |
190 $ hg -R other debugobsolete |
195 $ hg -R other debugobsolete |
191 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'} |
192 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'} |
205 adding manifests |
210 adding manifests |
206 adding file changes |
211 adding file changes |
207 added 1 changesets with 1 changes to 1 files (+1 heads) |
212 added 1 changesets with 1 changes to 1 files (+1 heads) |
208 1 new obsolescence markers |
213 1 new obsolescence markers |
209 updating bookmark book_42cc |
214 updating bookmark book_42cc |
|
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/ |
210 changegroup hook: HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ |
216 changegroup hook: HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ |
211 (run 'hg heads .' to see heads, 'hg merge' to merge) |
217 (run 'hg heads .' to see heads, 'hg merge' to merge) |
212 $ cat main-error.log |
218 $ cat main-error.log |
213 $ hg -R other debugobsolete |
219 $ hg -R other debugobsolete |
214 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'} |