equal
deleted
inserted
replaced
1310 new changesets 2ab8003a1750:99ba08759bc7 |
1310 new changesets 2ab8003a1750:99ba08759bc7 |
1311 updating to branch A |
1311 updating to branch A |
1312 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1312 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1313 #if v3 |
1313 #if v3 |
1314 $ cat branchmap-update-01/.hg/cache/branch3-base |
1314 $ cat branchmap-update-01/.hg/cache/branch3-base |
1315 tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 |
1315 tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 topo-mode=pure |
|
1316 A |
1316 #else |
1317 #else |
1317 $ cat branchmap-update-01/.hg/cache/branch2-base |
1318 $ cat branchmap-update-01/.hg/cache/branch2-base |
1318 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1319 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1319 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
1320 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
1320 #endif |
1321 #endif |
1325 added 2 changesets with 0 changes to 0 files |
1326 added 2 changesets with 0 changes to 0 files |
1326 new changesets a3b807b3ff0b:71ca9a6d524e (2 drafts) |
1327 new changesets a3b807b3ff0b:71ca9a6d524e (2 drafts) |
1327 (run 'hg update' to get a working copy) |
1328 (run 'hg update' to get a working copy) |
1328 #if v3 |
1329 #if v3 |
1329 $ cat branchmap-update-01/.hg/cache/branch3-served |
1330 $ cat branchmap-update-01/.hg/cache/branch3-served |
1330 tip-node=71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 tip-rev=3 |
1331 tip-node=71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 tip-rev=3 topo-mode=pure |
|
1332 A |
1331 #else |
1333 #else |
1332 $ cat branchmap-update-01/.hg/cache/branch2-served |
1334 $ cat branchmap-update-01/.hg/cache/branch2-served |
1333 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 3 |
1335 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 3 |
1334 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 o A |
1336 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 o A |
1335 #endif |
1337 #endif |
1354 updating to branch A |
1356 updating to branch A |
1355 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1357 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1356 |
1358 |
1357 #if v3 |
1359 #if v3 |
1358 $ cat branchmap-update-02/.hg/cache/branch3-base |
1360 $ cat branchmap-update-02/.hg/cache/branch3-base |
1359 tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 |
1361 tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 topo-mode=pure |
|
1362 A |
1360 #else |
1363 #else |
1361 $ cat branchmap-update-02/.hg/cache/branch2-base |
1364 $ cat branchmap-update-02/.hg/cache/branch2-base |
1362 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1365 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1363 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
1366 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
1364 #endif |
1367 #endif |
1370 rollback completed |
1373 rollback completed |
1371 abort: pretxnclose hook failed |
1374 abort: pretxnclose hook failed |
1372 [40] |
1375 [40] |
1373 #if v3 |
1376 #if v3 |
1374 $ cat branchmap-update-02/.hg/cache/branch3-base |
1377 $ cat branchmap-update-02/.hg/cache/branch3-base |
1375 tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 |
1378 tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 topo-mode=pure |
|
1379 A |
1376 #else |
1380 #else |
1377 $ cat branchmap-update-02/.hg/cache/branch2-base |
1381 $ cat branchmap-update-02/.hg/cache/branch2-base |
1378 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1382 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1379 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
1383 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
1380 #endif |
1384 #endif |