Show More
@@ -0,0 +1,33 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | echo "[extensions]" >> $HGRCPATH | |||
|
4 | echo "hgext.convert=" >> $HGRCPATH | |||
|
5 | ||||
|
6 | hg init orig | |||
|
7 | cd orig | |||
|
8 | ||||
|
9 | echo foo > foo | |||
|
10 | echo bar > bar | |||
|
11 | hg ci -qAm 'add foo bar' -d '0 0' | |||
|
12 | ||||
|
13 | echo >> foo | |||
|
14 | hg ci -m 'change foo' | |||
|
15 | ||||
|
16 | hg up -qC 0 | |||
|
17 | hg copy --after --force foo bar | |||
|
18 | hg copy foo baz | |||
|
19 | hg ci -m 'make bar and baz copies of foo' -d '1 0' | |||
|
20 | ||||
|
21 | hg merge | |||
|
22 | hg ci -m 'merge local copy' -d '2 0' | |||
|
23 | ||||
|
24 | hg up -C 1 | |||
|
25 | hg merge 2 | |||
|
26 | hg ci -m 'merge remote copy' -d '3 0' | |||
|
27 | ||||
|
28 | cd .. | |||
|
29 | hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' | |||
|
30 | cd new | |||
|
31 | hg out ../orig | |||
|
32 | ||||
|
33 | true |
@@ -0,0 +1,19 b'' | |||||
|
1 | merging baz and foo | |||
|
2 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
3 | (branch merge, don't forget to commit) | |||
|
4 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
5 | merging foo and baz | |||
|
6 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
7 | (branch merge, don't forget to commit) | |||
|
8 | initializing destination new repository | |||
|
9 | scanning source... | |||
|
10 | sorting... | |||
|
11 | converting... | |||
|
12 | 4 add foo bar | |||
|
13 | 3 change foo | |||
|
14 | 2 make bar and baz copies of foo | |||
|
15 | 1 merge local copy | |||
|
16 | 0 merge remote copy | |||
|
17 | comparing with ../orig | |||
|
18 | searching for changes | |||
|
19 | no changes found |
@@ -187,12 +187,11 b' class mercurial_source(converter_source)' | |||||
187 | m, a, r = self.repo.status(ctx.parents()[0].node(), ctx.node())[:3] |
|
187 | m, a, r = self.repo.status(ctx.parents()[0].node(), ctx.node())[:3] | |
188 | changes = [(name, rev) for name in m + a + r] |
|
188 | changes = [(name, rev) for name in m + a + r] | |
189 | changes.sort() |
|
189 | changes.sort() | |
190 | return (changes, self.getcopies(ctx)) |
|
190 | return (changes, self.getcopies(ctx, m + a)) | |
191 |
|
191 | |||
192 | def getcopies(self, ctx): |
|
192 | def getcopies(self, ctx, files): | |
193 | added = self.repo.status(ctx.parents()[0].node(), ctx.node())[1] |
|
|||
194 | copies = {} |
|
193 | copies = {} | |
195 |
for name in |
|
194 | for name in files: | |
196 | try: |
|
195 | try: | |
197 | copies[name] = ctx.filectx(name).renamed()[0] |
|
196 | copies[name] = ctx.filectx(name).renamed()[0] | |
198 | except TypeError: |
|
197 | except TypeError: |
General Comments 0
You need to be logged in to leave comments.
Login now