Mercurial > hg
comparison tests/test-convert-bzr-merges.t @ 39223:6c72e1248856
tests: add a test to show the added/modified/removed files in a bzr convert
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Fri, 13 Jul 2018 15:03:15 -0400 |
| parents | 7a88643bc0ef |
| children | 5e52b6da9c0c |
comparison
equal
deleted
inserted
replaced
| 39222:7a88643bc0ef | 39223:6c72e1248856 |
|---|---|
| 86 comparing with source-hg | 86 comparing with source-hg |
| 87 searching for changes | 87 searching for changes |
| 88 no changes found | 88 no changes found |
| 89 [1] | 89 [1] |
| 90 | 90 |
| 91 $ glog -R hg2hg | |
| 92 o 5@source "(octopus merge fixup)" files+: [], files-: [], files: [] | |
| 93 |\ | |
| 94 | o 4@source "Merged branches" files+: [file-branch1 file-branch2], files-: [], files: [file] | |
| 95 | |\ | |
| 96 o---+ 3@source-branch2 "Added brach2 file" files+: [file-branch2], files-: [], files: [] | |
| 97 / / | |
| 98 | o 2@source "Added parent file" files+: [file-parent], files-: [], files: [] | |
| 99 | | | |
| 100 o | 1@source-branch1 "Added branch1 file" files+: [file-branch1], files-: [], files: [file] | |
| 101 |/ | |
| 102 o 0@source "Initial add" files+: [file], files-: [], files: [] | |
| 103 | |
| 104 | |
| 91 $ hg -R source-hg log --debug -r tip | 105 $ hg -R source-hg log --debug -r tip |
| 92 changeset: 5:6bd55e8269392769783345686faf7ff7b3b0215d | 106 changeset: 5:6bd55e8269392769783345686faf7ff7b3b0215d |
| 93 branch: source | 107 branch: source |
| 94 tag: tip | 108 tag: tip |
| 95 phase: draft | 109 phase: draft |