equal
deleted
inserted
replaced
100 * bm3 2:c2e0ac586386 |
100 * bm3 2:c2e0ac586386 |
101 bmX 2:c2e0ac586386 (vfs !) |
101 bmX 2:c2e0ac586386 (vfs !) |
102 transaction abort! |
102 transaction abort! |
103 rollback completed |
103 rollback completed |
104 abort: pretxnclose hook exited with status 1 |
104 abort: pretxnclose hook exited with status 1 |
105 [255] |
105 [40] |
106 $ hg book bm1 |
106 $ hg book bm1 |
107 |
107 |
108 FYI, in contrast to above test, bmX is invisible in repo1 (= shared |
108 FYI, in contrast to above test, bmX is invisible in repo1 (= shared |
109 src), because (1) HG_PENDING refers only repo3 and (2) |
109 src), because (1) HG_PENDING refers only repo3 and (2) |
110 "bookmarks.pending" is written only into repo3. |
110 "bookmarks.pending" is written only into repo3. |
125 bm3 2:c2e0ac586386 |
125 bm3 2:c2e0ac586386 |
126 * bmX 2:c2e0ac586386 |
126 * bmX 2:c2e0ac586386 |
127 transaction abort! |
127 transaction abort! |
128 rollback completed |
128 rollback completed |
129 abort: pretxnclose hook exited with status 1 |
129 abort: pretxnclose hook exited with status 1 |
130 [255] |
130 [40] |
131 $ hg book bm3 |
131 $ hg book bm3 |
132 |
132 |
133 clean up bm2 since it's uninteresting (not shared in the vfs case and |
133 clean up bm2 since it's uninteresting (not shared in the vfs case and |
134 same as bm3 in the svfs case) |
134 same as bm3 in the svfs case) |
135 $ cd ../repo2 |
135 $ cd ../repo2 |
247 pulling from $TESTTMP/repo4 |
247 pulling from $TESTTMP/repo4 |
248 searching for changes |
248 searching for changes |
249 no changes found |
249 no changes found |
250 adding remote bookmark bm3 |
250 adding remote bookmark bm3 |
251 abort: forced failure by extension |
251 abort: forced failure by extension |
252 [255] |
252 [40] |
253 $ hg boo |
253 $ hg boo |
254 bm1 3:b87954705719 |
254 bm1 3:b87954705719 |
255 bm4 5:92793bfc8cad |
255 bm4 5:92793bfc8cad |
256 $ hg pull $TESTTMP/repo4 |
256 $ hg pull $TESTTMP/repo4 |
257 pulling from $TESTTMP/repo4 |
257 pulling from $TESTTMP/repo4 |