Mercurial > hg
changeset 16508:475de53c08f4 stable
test-rebase: exhibit revisions which should have been skipped
This will be fixed in the next commit.
v2:
- Display emptied grafted revisions
- Use --git flag
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sun, 22 Apr 2012 18:27:50 +0200 |
| parents | 1f020021adfa |
| children | eab9119c5dee |
| files | tests/test-graft.t tests/test-rebase-detach.t tests/test-rebase-mq-skip.t |
| diffstat | 3 files changed, 24 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-graft.t Sun Apr 22 16:40:38 2012 +0200 +++ b/tests/test-graft.t Sun Apr 22 18:27:50 2012 +0200 @@ -227,6 +227,14 @@ |/ o test@0.public: 0 + $ hg export --git 8 + # HG changeset patch + # User bar + # Date 0 0 + # Node ID 6f5ea6ac8b705521c6d5f49a04ed142e3f76645d + # Parent d2e44c99fd3f31c176ea4efb9eca9f6306c81756 + 1 + Graft again onto another branch should preserve the original source $ hg up -q 0 $ echo 'g'>g
--- a/tests/test-rebase-detach.t Sun Apr 22 16:40:38 2012 +0200 +++ b/tests/test-rebase-detach.t Sun Apr 22 18:27:50 2012 +0200 @@ -398,4 +398,11 @@ |/ o 0:draft 'A' - + $ hg export --git 8 + # HG changeset patch + # User test + # Date 0 0 + # Node ID 248209b40064fe67181915fa7a4f3395520f700a + # Parent 02de42196ebee42ef284b6780a87cdc96e8eaab6 + H2 +
--- a/tests/test-rebase-mq-skip.t Sun Apr 22 16:40:38 2012 +0200 +++ b/tests/test-rebase-mq-skip.t Sun Apr 22 18:27:50 2012 +0200 @@ -137,3 +137,11 @@ | o 0: 'r0' tags: + $ hg export --git 4.diff + # HG changeset patch + # User test + # Date 0 0 + # Node ID 315eb21a13c2b06e787f5d0000e36f8f8f3a1768 + # Parent 1660ab13ce9aea3da22ea54926bd49aeff8a4e20 + r4 +