Show More
@@ -1410,3 +1410,131 b' Writing the nodes in old format to graft' | |||||
1410 | $ hg graft --continue |
|
1410 | $ hg graft --continue | |
1411 | grafting 1:80e6d2c47cfe "added b" |
|
1411 | grafting 1:80e6d2c47cfe "added b" | |
1412 | grafting 2:8be98ac1a569 "added c" |
|
1412 | grafting 2:8be98ac1a569 "added c" | |
|
1413 | ||||
|
1414 | Testing that --user is preserved during conflicts and value is reused while | |||
|
1415 | running `hg graft --continue` | |||
|
1416 | ||||
|
1417 | $ hg log -G | |||
|
1418 | @ changeset: 5:711e9fa999f1 | |||
|
1419 | | tag: tip | |||
|
1420 | | user: test | |||
|
1421 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1422 | | summary: added c | |||
|
1423 | | | |||
|
1424 | o changeset: 4:e5ad7353b408 | |||
|
1425 | | user: test | |||
|
1426 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1427 | | summary: added b | |||
|
1428 | | | |||
|
1429 | o changeset: 3:9e887f7a939c | |||
|
1430 | | parent: 0:f7ad41964313 | |||
|
1431 | | user: test | |||
|
1432 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1433 | | summary: bar to b | |||
|
1434 | | | |||
|
1435 | | o changeset: 2:8be98ac1a569 | |||
|
1436 | | | user: test | |||
|
1437 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1438 | | | summary: added c | |||
|
1439 | | | | |||
|
1440 | | o changeset: 1:80e6d2c47cfe | |||
|
1441 | |/ user: test | |||
|
1442 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1443 | | summary: added b | |||
|
1444 | | | |||
|
1445 | o changeset: 0:f7ad41964313 | |||
|
1446 | user: test | |||
|
1447 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1448 | summary: added a | |||
|
1449 | ||||
|
1450 | ||||
|
1451 | $ hg up '.^^' | |||
|
1452 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
1453 | ||||
|
1454 | $ hg graft -r 1 -r 2 --user batman | |||
|
1455 | grafting 1:80e6d2c47cfe "added b" | |||
|
1456 | merging b | |||
|
1457 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |||
|
1458 | abort: unresolved conflicts, can't continue | |||
|
1459 | (use 'hg resolve' and 'hg graft --continue --user batman') | |||
|
1460 | [255] | |||
|
1461 | ||||
|
1462 | $ echo wat > b | |||
|
1463 | $ hg resolve -m | |||
|
1464 | (no more unresolved files) | |||
|
1465 | continue: hg graft --continue | |||
|
1466 | ||||
|
1467 | $ hg graft --continue | |||
|
1468 | grafting 1:80e6d2c47cfe "added b" | |||
|
1469 | grafting 2:8be98ac1a569 "added c" | |||
|
1470 | ||||
|
1471 | XXX: the user of 6 and 7 should be batman | |||
|
1472 | $ hg log -Gr 3:: | |||
|
1473 | @ changeset: 7:89f377552d81 | |||
|
1474 | | tag: tip | |||
|
1475 | | user: test | |||
|
1476 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1477 | | summary: added c | |||
|
1478 | | | |||
|
1479 | o changeset: 6:393512ff89b9 | |||
|
1480 | | parent: 3:9e887f7a939c | |||
|
1481 | | user: test | |||
|
1482 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1483 | | summary: added b | |||
|
1484 | | | |||
|
1485 | | o changeset: 5:711e9fa999f1 | |||
|
1486 | | | user: test | |||
|
1487 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1488 | | | summary: added c | |||
|
1489 | | | | |||
|
1490 | | o changeset: 4:e5ad7353b408 | |||
|
1491 | |/ user: test | |||
|
1492 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1493 | | summary: added b | |||
|
1494 | | | |||
|
1495 | o changeset: 3:9e887f7a939c | |||
|
1496 | | parent: 0:f7ad41964313 | |||
|
1497 | ~ user: test | |||
|
1498 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1499 | summary: bar to b | |||
|
1500 | ||||
|
1501 | Test that --date is preserved and reused in `hg graft --continue` | |||
|
1502 | ||||
|
1503 | $ hg up '.^^' | |||
|
1504 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
1505 | $ hg graft -r 1 -r 2 --date '1234560000 120' | |||
|
1506 | grafting 1:80e6d2c47cfe "added b" | |||
|
1507 | merging b | |||
|
1508 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |||
|
1509 | abort: unresolved conflicts, can't continue | |||
|
1510 | (use 'hg resolve' and 'hg graft --continue --date '1234560000 120'') | |||
|
1511 | [255] | |||
|
1512 | ||||
|
1513 | $ echo foobar > b | |||
|
1514 | $ hg resolve -m | |||
|
1515 | (no more unresolved files) | |||
|
1516 | continue: hg graft --continue | |||
|
1517 | $ hg graft --continue | |||
|
1518 | grafting 1:80e6d2c47cfe "added b" | |||
|
1519 | grafting 2:8be98ac1a569 "added c" | |||
|
1520 | ||||
|
1521 | XXX: 8 and 9 show have the date we passed | |||
|
1522 | $ hg log -Gr '.^^::.' | |||
|
1523 | @ changeset: 9:7ee8d3496b19 | |||
|
1524 | | tag: tip | |||
|
1525 | | user: test | |||
|
1526 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1527 | | summary: added c | |||
|
1528 | | | |||
|
1529 | o changeset: 8:802f1eae3af3 | |||
|
1530 | | parent: 3:9e887f7a939c | |||
|
1531 | | user: test | |||
|
1532 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1533 | | summary: added b | |||
|
1534 | | | |||
|
1535 | o changeset: 3:9e887f7a939c | |||
|
1536 | | parent: 0:f7ad41964313 | |||
|
1537 | ~ user: test | |||
|
1538 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1539 | summary: bar to b | |||
|
1540 |
General Comments 0
You need to be logged in to leave comments.
Login now