Show More
@@ -665,8 +665,7 b' def newheads(repo, heads, roots):' | |||
|
665 | 665 | * `heads`: define the first subset |
|
666 | 666 | * `roots`: define the second we subtract from the first""" |
|
667 | 667 | repo = repo.unfiltered() |
|
668 |
revset = repo.set('heads( |
|
|
669 | heads, roots, roots, heads) | |
|
668 | revset = repo.set('heads(::%ln - (%ln::%ln))', heads, roots, heads) | |
|
670 | 669 | return [c.node() for c in revset] |
|
671 | 670 | |
|
672 | 671 |
@@ -1478,7 +1478,8 b' Works with default settings' | |||
|
1478 | 1478 | $ killdaemons.py |
|
1479 | 1479 | |
|
1480 | 1480 | With legacy listkeys over bundle2 |
|
1481 |
|
|
|
1481 | (issue 5939: public phase was lost on 26805 and f5853 before, due to a bug | |
|
1482 | of phase heads computation) | |
|
1482 | 1483 | |
|
1483 | 1484 | $ hg -R mergetest --config devel.legacy.exchange=phases serve -p $HGPORT -d --pid-file=hg.pid |
|
1484 | 1485 | $ cat hg.pid >> $DAEMON_PIDS |
@@ -1492,9 +1493,9 b' TODO issue 5939: public phase lost on 26' | |||
|
1492 | 1493 | new changesets 426bada5c675:bb94757e651a |
|
1493 | 1494 | test-debug-phase: new rev 0: x -> 0 |
|
1494 | 1495 | test-debug-phase: new rev 1: x -> 0 |
|
1495 |
test-debug-phase: new rev 2: x -> |
|
|
1496 | test-debug-phase: new rev 2: x -> 0 | |
|
1496 | 1497 | test-debug-phase: new rev 3: x -> 1 |
|
1497 |
test-debug-phase: new rev 4: x -> |
|
|
1498 | test-debug-phase: new rev 4: x -> 0 | |
|
1498 | 1499 | test-debug-phase: new rev 5: x -> 1 |
|
1499 | 1500 | test-debug-phase: new rev 6: x -> 1 |
|
1500 | 1501 | test-debug-phase: new rev 7: x -> 1 |
@@ -1506,11 +1507,11 b' TODO issue 5939: public phase lost on 26' | |||
|
1506 | 1507 | |/| |
|
1507 | 1508 | o | 13b7b draft |
|
1508 | 1509 | | | |
|
1509 |
| o f5853 |
|
|
1510 | | o f5853 public | |
|
1510 | 1511 | | | |
|
1511 | 1512 | o | c67c4 draft |
|
1512 | 1513 | | | |
|
1513 |
| o 26805 |
|
|
1514 | | o 26805 public | |
|
1514 | 1515 | |/ |
|
1515 | 1516 | o 11247 public |
|
1516 | 1517 | | |
@@ -1519,7 +1520,8 b' TODO issue 5939: public phase lost on 26' | |||
|
1519 | 1520 | $ killdaemons.py |
|
1520 | 1521 | |
|
1521 | 1522 | Without bundle2 |
|
1522 |
|
|
|
1523 | (issue 5939: public phase was lost on 26805 and f5853 before, due to a bug | |
|
1524 | of phase heads computation) | |
|
1523 | 1525 | |
|
1524 | 1526 | $ hg -R mergetest serve -p $HGPORT -d --pid-file=hg.pid |
|
1525 | 1527 | $ cat hg.pid >> $DAEMON_PIDS |
@@ -1533,9 +1535,9 b' TODO issue 5939: public phase lost on 26' | |||
|
1533 | 1535 | new changesets 426bada5c675:bb94757e651a |
|
1534 | 1536 | test-debug-phase: new rev 0: x -> 0 |
|
1535 | 1537 | test-debug-phase: new rev 1: x -> 0 |
|
1536 |
test-debug-phase: new rev 2: x -> |
|
|
1538 | test-debug-phase: new rev 2: x -> 0 | |
|
1537 | 1539 | test-debug-phase: new rev 3: x -> 1 |
|
1538 |
test-debug-phase: new rev 4: x -> |
|
|
1540 | test-debug-phase: new rev 4: x -> 0 | |
|
1539 | 1541 | test-debug-phase: new rev 5: x -> 1 |
|
1540 | 1542 | test-debug-phase: new rev 6: x -> 1 |
|
1541 | 1543 | test-debug-phase: new rev 7: x -> 1 |
@@ -1547,11 +1549,11 b' TODO issue 5939: public phase lost on 26' | |||
|
1547 | 1549 | |/| |
|
1548 | 1550 | o | 13b7b draft |
|
1549 | 1551 | | | |
|
1550 |
| o f5853 |
|
|
1552 | | o f5853 public | |
|
1551 | 1553 | | | |
|
1552 | 1554 | o | c67c4 draft |
|
1553 | 1555 | | | |
|
1554 |
| o 26805 |
|
|
1556 | | o 26805 public | |
|
1555 | 1557 | |/ |
|
1556 | 1558 | o 11247 public |
|
1557 | 1559 | | |
General Comments 0
You need to be logged in to leave comments.
Login now