Show More
@@ -807,7 +807,7 b' def _follow(repo, subset, x, name, follo' | |||||
807 | cx = c[x] |
|
807 | cx = c[x] | |
808 | s = set(ctx.rev() for ctx in cx.ancestors(followfirst=followfirst)) |
|
808 | s = set(ctx.rev() for ctx in cx.ancestors(followfirst=followfirst)) | |
809 | # include the revision responsible for the most recent version |
|
809 | # include the revision responsible for the most recent version | |
810 |
s.add(cx. |
|
810 | s.add(cx.introrev()) | |
811 | else: |
|
811 | else: | |
812 | return baseset() |
|
812 | return baseset() | |
813 | else: |
|
813 | else: |
@@ -1559,7 +1559,7 b' hg log -f dir across branches' | |||||
1559 | o a |
|
1559 | o a | |
1560 |
|
1560 | |||
1561 | $ hg log -f d/a -T '{desc}' -G |
|
1561 | $ hg log -f d/a -T '{desc}' -G | |
1562 |
|
|
1562 | @ c | |
1563 | | |
|
1563 | | | |
1564 | o a |
|
1564 | o a | |
1565 |
|
1565 | |||
@@ -1656,4 +1656,21 b' plain log lists the original version' | |||||
1656 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1656 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1657 | summary: content1 |
|
1657 | summary: content1 | |
1658 |
|
1658 | |||
|
1659 | ||||
|
1660 | hg log -f from the grafted changeset | |||
|
1661 | (The bootstrap should properly take the topology in account) | |||
|
1662 | ||||
|
1663 | $ hg up 'desc(content3)^' | |||
|
1664 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
1665 | $ hg log -Gf a | |||
|
1666 | @ changeset: 3:15b2327059e5 | |||
|
1667 | | user: test | |||
|
1668 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1669 | | summary: content2 | |||
|
1670 | | | |||
|
1671 | o changeset: 0:ae0a3c9f9e95 | |||
|
1672 | user: test | |||
|
1673 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1674 | summary: content1 | |||
|
1675 | ||||
1659 | $ cd .. |
|
1676 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now