Show More
@@ -440,7 +440,7 b' class converter(object):' | |||||
440 | try: |
|
440 | try: | |
441 | parents = self.splicemap[rev] |
|
441 | parents = self.splicemap[rev] | |
442 | self.ui.status(_('spliced in %s as parents of %s\n') % |
|
442 | self.ui.status(_('spliced in %s as parents of %s\n') % | |
443 | (parents, rev)) |
|
443 | (_(' and ').join(parents), rev)) | |
444 | parents = [self.map.get(p, p) for p in parents] |
|
444 | parents = [self.map.get(p, p) for p in parents] | |
445 | except KeyError: |
|
445 | except KeyError: | |
446 | parents = [b[0] for b in pbranches] |
|
446 | parents = [b[0] for b in pbranches] |
@@ -100,9 +100,9 b' splice repo2 on repo1' | |||||
100 | sorting... |
|
100 | sorting... | |
101 | converting... |
|
101 | converting... | |
102 | 2 addaandd |
|
102 | 2 addaandd | |
103 |
spliced in |
|
103 | spliced in 6d4c2037ddc2cb2627ac3a244ecce35283268f8e as parents of 527cdedf31fbd5ea708aa14eeecf53d4676f38db | |
104 | 1 changed |
|
104 | 1 changed | |
105 |
spliced in |
|
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 | |
@@ -161,7 +161,7 b' Test regular conversion' | |||||
161 | 2 changea |
|
161 | 2 changea | |
162 | 1 addb |
|
162 | 1 addb | |
163 | 0 changeaagain |
|
163 | 0 changeaagain | |
164 |
spliced in |
|
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 | |\ | |
@@ -199,7 +199,7 b' and destination identifiers. Test unknow' | |||||
199 | sorting... |
|
199 | sorting... | |
200 | converting... |
|
200 | converting... | |
201 | 0 changeaagain |
|
201 | 0 changeaagain | |
202 |
spliced in |
|
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 | |\ |
General Comments 0
You need to be logged in to leave comments.
Login now