Mercurial > hg > mercurial-source
comparison tests/test-convert-splicemap.t @ 27452:58a309e9cf80
convert: fix Python syntax in 'splice in' message
Instead of reporting
spliced in ['82544090e14fe18091e04f1fb0f0d7991cbe6e7e'] as parents of 369fd983d9e13330e9f12d9fce820deae84ea223
report
spliced in 82544090e14fe18091e04f1fb0f0d7991cbe6e7e as parents of 369fd983d9e13330e9f12d9fce820deae84ea223
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 19 Oct 2015 16:49:54 +0200 |
| parents | aa9385f983fa |
| children |
comparison
equal
deleted
inserted
replaced
| 27451:d1561a422748 | 27452:58a309e9cf80 |
|---|---|
| 98 $ hg convert --splicemap splicemap repo2 target1 | 98 $ hg convert --splicemap splicemap repo2 target1 |
| 99 scanning source... | 99 scanning source... |
| 100 sorting... | 100 sorting... |
| 101 converting... | 101 converting... |
| 102 2 addaandd | 102 2 addaandd |
| 103 spliced in ['6d4c2037ddc2cb2627ac3a244ecce35283268f8e'] as parents of 527cdedf31fbd5ea708aa14eeecf53d4676f38db | 103 spliced in 6d4c2037ddc2cb2627ac3a244ecce35283268f8e as parents of 527cdedf31fbd5ea708aa14eeecf53d4676f38db |
| 104 1 changed | 104 1 changed |
| 105 spliced in ['e55c719b85b60e5102fac26110ba626e7cb6b7dc', '527cdedf31fbd5ea708aa14eeecf53d4676f38db'] as parents of e4ea00df91897da3079a10fab658c1eddba6617b | 105 spliced in e55c719b85b60e5102fac26110ba626e7cb6b7dc and 527cdedf31fbd5ea708aa14eeecf53d4676f38db as parents of e4ea00df91897da3079a10fab658c1eddba6617b |
| 106 0 adde | 106 0 adde |
| 107 $ glog -R target1 | 107 $ glog -R target1 |
| 108 o 5:16bc847b02aa "adde" files: e | 108 o 5:16bc847b02aa "adde" files: e |
| 109 | | 109 | |
| 110 o 4:e30e4fee3418 "changed" files: d | 110 o 4:e30e4fee3418 "changed" files: d |
| 159 converting... | 159 converting... |
| 160 3 adda | 160 3 adda |
| 161 2 changea | 161 2 changea |
| 162 1 addb | 162 1 addb |
| 163 0 changeaagain | 163 0 changeaagain |
| 164 spliced in ['717d54d67e6c31fd75ffef2ff3042bdd98418437', '102a90ea7b4a3361e4082ed620918c261189a36a'] as parents of 7c364e7fa7d70ae525610c016317ed717b519d97 | 164 spliced in 717d54d67e6c31fd75ffef2ff3042bdd98418437 and 102a90ea7b4a3361e4082ed620918c261189a36a as parents of 7c364e7fa7d70ae525610c016317ed717b519d97 |
| 165 $ glog -R ordered-hg1 | 165 $ glog -R ordered-hg1 |
| 166 o 3:4cb04b9afbf2 "changeaagain" files: a | 166 o 3:4cb04b9afbf2 "changeaagain" files: a |
| 167 |\ | 167 |\ |
| 168 | o 2:102a90ea7b4a "addb" files: b | 168 | o 2:102a90ea7b4a "addb" files: b |
| 169 | | | 169 | | |
| 197 scanning source... | 197 scanning source... |
| 198 splice map revision deadbeef102a90ea7b4a3361e4082ed620918c26 is not being converted, ignoring | 198 splice map revision deadbeef102a90ea7b4a3361e4082ed620918c26 is not being converted, ignoring |
| 199 sorting... | 199 sorting... |
| 200 converting... | 200 converting... |
| 201 0 changeaagain | 201 0 changeaagain |
| 202 spliced in ['717d54d67e6c31fd75ffef2ff3042bdd98418437', '102a90ea7b4a3361e4082ed620918c261189a36a'] as parents of 7c364e7fa7d70ae525610c016317ed717b519d97 | 202 spliced in 717d54d67e6c31fd75ffef2ff3042bdd98418437 and 102a90ea7b4a3361e4082ed620918c261189a36a as parents of 7c364e7fa7d70ae525610c016317ed717b519d97 |
| 203 $ glog -R ordered-hg2 | 203 $ glog -R ordered-hg2 |
| 204 o 3:4cb04b9afbf2 "changeaagain" files: a | 204 o 3:4cb04b9afbf2 "changeaagain" files: a |
| 205 |\ | 205 |\ |
| 206 | o 2:102a90ea7b4a "addb" files: b | 206 | o 2:102a90ea7b4a "addb" files: b |
| 207 | | | 207 | | |