Mercurial > hg
diff tests/test-rebase-collapse.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-collapse.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-collapse.out Thu May 20 12:21:35 2010 -0500 @@ -16,6 +16,7 @@ % Rebasing B onto H 3 files updated, 0 files merged, 2 files removed, 0 files unresolved +saved backup bundle to adding branch adding changesets adding manifests @@ -45,6 +46,7 @@ H % Rebasing G onto H +saved backup bundle to adding branch adding changesets adding manifests @@ -93,6 +95,7 @@ abort: unable to collapse, there is more than one external parent % Rebase and collapse - E onto H +saved backup bundle to adding branch adding changesets adding manifests @@ -142,6 +145,7 @@ % Rebase and collapse - E onto I merging E +saved backup bundle to adding branch adding changesets adding manifests @@ -187,6 +191,7 @@ % Rebase and collapse - B onto F +saved backup bundle to adding branch adding changesets adding manifests