Mercurial > hg
diff tests/test-convert-bzr.t @ 39222:7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
There's a bug related to incorrect status values that can be triggered by an
octopus fixup merge. Seeing what the current status is (instead of just the
aggregate list) will hopefully help track this down.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 13 Jul 2018 12:33:06 -0400 |
parents | 75be14993fda |
children | 5abc47d4ca6b |
line wrap: on
line diff
--- a/tests/test-convert-bzr.t Mon Aug 20 22:04:22 2018 -0400 +++ b/tests/test-convert-bzr.t Fri Jul 13 12:33:06 2018 -0400 @@ -42,9 +42,9 @@ 1 Initial add: a, c, e 0 rename a into b, create a, rename c into d $ glog -R source-hg - o 1@source "rename a into b, create a, rename c into d" files: a b c d e f + o 1@source "rename a into b, create a, rename c into d" files+: [b d f], files-: [c e], files: [a] | - o 0@source "Initial add: a, c, e" files: a c e + o 0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: [] manifest @@ -64,7 +64,7 @@ converting... 0 Initial add: a, c, e $ glog -R source-1-hg - o 0@source "Initial add: a, c, e" files: a c e + o 0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: [] test with filemap @@ -147,13 +147,13 @@ 1 Editing b 0 Merged improve branch $ glog -R source-hg - o 3@source "Merged improve branch" files: + o 3@source "Merged improve branch" files+: [], files-: [], files: [b] |\ - | o 2@source-improve "Editing b" files: b + | o 2@source-improve "Editing b" files+: [], files-: [], files: [b] | | - o | 1@source "Editing a" files: a + o | 1@source "Editing a" files+: [], files-: [], files: [a] |/ - o 0@source "Initial add" files: a b + o 0@source "Initial add" files+: [a b], files-: [], files: [] $ cd .. @@ -250,13 +250,13 @@ 0 changea updating tags $ (cd repo-bzr; glog) - o 3@default "update tags" files: .hgtags + o 3@default "update tags" files+: [.hgtags], files-: [], files: [] | - o 2@default "changea" files: a + o 2@default "changea" files+: [], files-: [], files: [a] | - | o 1@branch "addb" files: b + | o 1@branch "addb" files+: [b], files-: [], files: [] |/ - o 0@default "adda" files: a + o 0@default "adda" files+: [a], files-: [], files: [] Test tags (converted identifiers are not stable because bzr ones are