1320 adding file changes |
1332 adding file changes |
1321 added 2 changesets with 0 changes to 0 files |
1333 added 2 changesets with 0 changes to 0 files |
1322 new changesets 2ab8003a1750:99ba08759bc7 |
1334 new changesets 2ab8003a1750:99ba08759bc7 |
1323 updating to branch A |
1335 updating to branch A |
1324 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1336 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1337 #if v3 |
|
1338 $ cat branchmap-update-01/.hg/cache/branch3-base |
|
1339 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
|
1340 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
|
1341 #else |
1325 $ cat branchmap-update-01/.hg/cache/branch2-base |
1342 $ cat branchmap-update-01/.hg/cache/branch2-base |
1326 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1343 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1327 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
1344 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
|
1345 #endif |
1328 $ hg -R branchmap-update-01 unbundle bundle.hg |
1346 $ hg -R branchmap-update-01 unbundle bundle.hg |
1329 adding changesets |
1347 adding changesets |
1330 adding manifests |
1348 adding manifests |
1331 adding file changes |
1349 adding file changes |
1332 added 2 changesets with 0 changes to 0 files |
1350 added 2 changesets with 0 changes to 0 files |
1333 new changesets a3b807b3ff0b:71ca9a6d524e (2 drafts) |
1351 new changesets a3b807b3ff0b:71ca9a6d524e (2 drafts) |
1334 (run 'hg update' to get a working copy) |
1352 (run 'hg update' to get a working copy) |
|
1353 #if v3 |
|
1354 $ cat branchmap-update-01/.hg/cache/branch3-served |
|
1355 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 3 |
|
1356 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 o A |
|
1357 #else |
1335 $ cat branchmap-update-01/.hg/cache/branch2-served |
1358 $ cat branchmap-update-01/.hg/cache/branch2-served |
1336 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 3 |
1359 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 3 |
1337 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 o A |
1360 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 o A |
|
1361 #endif |
1338 |
1362 |
1339 aborted Unbundle should not update the on disk cache |
1363 aborted Unbundle should not update the on disk cache |
1340 |
1364 |
1341 $ cat >> simplehook.py << EOF |
1365 $ cat >> simplehook.py << EOF |
1342 > import sys |
1366 > import sys |
1354 added 2 changesets with 0 changes to 0 files |
1378 added 2 changesets with 0 changes to 0 files |
1355 new changesets 2ab8003a1750:99ba08759bc7 |
1379 new changesets 2ab8003a1750:99ba08759bc7 |
1356 updating to branch A |
1380 updating to branch A |
1357 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1381 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1358 |
1382 |
|
1383 #if v3 |
|
1384 $ cat branchmap-update-02/.hg/cache/branch3-base |
|
1385 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
|
1386 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
|
1387 #else |
1359 $ cat branchmap-update-02/.hg/cache/branch2-base |
1388 $ cat branchmap-update-02/.hg/cache/branch2-base |
1360 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1389 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1361 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
1390 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
|
1391 #endif |
1362 $ hg -R branchmap-update-02 unbundle bundle.hg --config "hooks.pretxnclose=python:$TESTTMP/simplehook.py:hook" |
1392 $ hg -R branchmap-update-02 unbundle bundle.hg --config "hooks.pretxnclose=python:$TESTTMP/simplehook.py:hook" |
1363 adding changesets |
1393 adding changesets |
1364 adding manifests |
1394 adding manifests |
1365 adding file changes |
1395 adding file changes |
1366 transaction abort! |
1396 transaction abort! |
1367 rollback completed |
1397 rollback completed |
1368 abort: pretxnclose hook failed |
1398 abort: pretxnclose hook failed |
1369 [40] |
1399 [40] |
|
1400 #if v3 |
|
1401 $ cat branchmap-update-02/.hg/cache/branch3-base |
|
1402 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
|
1403 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
|
1404 #else |
1370 $ cat branchmap-update-02/.hg/cache/branch2-base |
1405 $ cat branchmap-update-02/.hg/cache/branch2-base |
1371 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1406 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
1372 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
1407 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
|
1408 #endif |