Mercurial > hg
diff tests/test-rebase-scenario-global.out @ 11201:34023f2ca305
Fix up rebase's handling of strip backups
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 20 May 2010 12:21:35 -0500 |
parents | 4bb4895e1693 |
children | f974fe896921 |
line wrap: on
line diff
--- a/tests/test-rebase-scenario-global.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-scenario-global.out Thu May 20 12:21:35 2010 -0500 @@ -12,6 +12,7 @@ % Rebasing % B onto F - simple rebase +saved backup bundle to adding branch adding changesets adding manifests @@ -31,6 +32,7 @@ o 0: A % B onto D - intermediate point +saved backup bundle to adding branch adding changesets adding manifests @@ -50,6 +52,7 @@ o 0: A % C onto F - skip of E +saved backup bundle to adding branch adding changesets adding manifests @@ -67,6 +70,7 @@ o 0: A % D onto C - rebase of a branching point (skip E) +saved backup bundle to adding branch adding changesets adding manifests @@ -84,6 +88,7 @@ o 0: A % E onto F - merged revision having a parent in ancestors of target +saved backup bundle to adding branch adding changesets adding manifests @@ -103,6 +108,7 @@ o 0: A % D onto B - E maintains C as parent +saved backup bundle to adding branch adding changesets adding manifests