Show More
@@ -1116,6 +1116,12 b' class svn_sink(converter_sink, commandli' | |||||
1116 | return u"svn:%s@%s" % (self.uuid, rev) |
|
1116 | return u"svn:%s@%s" % (self.uuid, rev) | |
1117 |
|
1117 | |||
1118 | def putcommit(self, files, copies, parents, commit, source, revmap): |
|
1118 | def putcommit(self, files, copies, parents, commit, source, revmap): | |
|
1119 | for parent in parents: | |||
|
1120 | try: | |||
|
1121 | return self.revid(self.childmap[parent]) | |||
|
1122 | except KeyError: | |||
|
1123 | pass | |||
|
1124 | ||||
1119 | # Apply changes to working copy |
|
1125 | # Apply changes to working copy | |
1120 | for f, v in files: |
|
1126 | for f, v in files: | |
1121 | try: |
|
1127 | try: | |
@@ -1128,11 +1134,6 b' class svn_sink(converter_sink, commandli' | |||||
1128 | self.copies.append([copies[f], f]) |
|
1134 | self.copies.append([copies[f], f]) | |
1129 | files = [f[0] for f in files] |
|
1135 | files = [f[0] for f in files] | |
1130 |
|
1136 | |||
1131 | for parent in parents: |
|
|||
1132 | try: |
|
|||
1133 | return self.revid(self.childmap[parent]) |
|
|||
1134 | except KeyError: |
|
|||
1135 | pass |
|
|||
1136 | entries = set(self.delete) |
|
1137 | entries = set(self.delete) | |
1137 | files = frozenset(files) |
|
1138 | files = frozenset(files) | |
1138 | entries.update(self.add_dirs(files.difference(entries))) |
|
1139 | entries.update(self.add_dirs(files.difference(entries))) |
General Comments 0
You need to be logged in to leave comments.
Login now