##// END OF EJS Templates
Merge with crew-stable
Patrick Mezard -
r8166:56719b1a merge default
parent child Browse files
Show More
@@ -123,9 +123,8 b' class bzr_source(converter_source):'
123 def getchangedfiles(self, rev, i):
123 def getchangedfiles(self, rev, i):
124 self._modecache = {}
124 self._modecache = {}
125 curtree = self.sourcerepo.revision_tree(rev)
125 curtree = self.sourcerepo.revision_tree(rev)
126 parentids = self._parentids.pop(rev)
127 if i is not None:
126 if i is not None:
128 parentid = parentids[i]
127 parentid = self._parentids[rev][i]
129 else:
128 else:
130 # no parent id, get the empty revision
129 # no parent id, get the empty revision
131 parentid = revision.NULL_REVISION
130 parentid = revision.NULL_REVISION
@@ -27,6 +27,12 b' hg manifest -R source-hg -r tip'
27 echo "% test --rev option"
27 echo "% test --rev option"
28 hg convert -r 1 source source-1-hg
28 hg convert -r 1 source source-1-hg
29 glog -R source-1-hg
29 glog -R source-1-hg
30 echo "% test with filemap"
31 cat > filemap <<EOF
32 exclude a
33 EOF
34 hg convert --filemap filemap source source-filemap-hg
35 hg -R source-filemap-hg manifest -r tip
30 cd ..
36 cd ..
31
37
32 echo % merge
38 echo % merge
@@ -25,6 +25,16 b' converting...'
25 0 Initial add: a, c, e
25 0 Initial add: a, c, e
26 o 0 "Initial add: a, c, e" files: a c e
26 o 0 "Initial add: a, c, e" files: a c e
27
27
28 % test with filemap
29 initializing destination source-filemap-hg repository
30 scanning source...
31 sorting...
32 converting...
33 1 Initial add: a, c, e
34 0 rename a into b, create a, rename c into d
35 b
36 d
37 f
28 % merge
38 % merge
29 initializing destination source-hg repository
39 initializing destination source-hg repository
30 scanning source...
40 scanning source...
General Comments 0
You need to be logged in to leave comments. Login now