##// END OF EJS Templates
convert: fix darcs_source.pull() under windows
Patrick Mezard -
r5412:fbf40ad5 default
parent child Browse files
Show More
@@ -100,15 +100,15 b' class darcs_source(converter_source):'
100 desc=desc.strip(), parents=self.parents[rev])
100 desc=desc.strip(), parents=self.parents[rev])
101
101
102 def pull(self, rev):
102 def pull(self, rev):
103 output, status = self.run('pull %r --all --match="hash %s"' %
103 output, status = self.run('pull', self.path, '--all',
104 (self.path, rev),
104 '--match', 'hash %s' % rev,
105 '--no-test', '--no-posthook',
105 '--no-test', '--no-posthook',
106 '--external-merge=/bin/false',
106 '--external-merge', '/bin/false',
107 repodir=self.tmppath)
107 repodir=self.tmppath)
108 if status:
108 if status:
109 if output.find('We have conflicts in') == -1:
109 if output.find('We have conflicts in') == -1:
110 self.checkexit(status, output)
110 self.checkexit(status, output)
111 output, status = self.run('revert --all', repodir=self.tmppath)
111 output, status = self.run('revert', '--all', repodir=self.tmppath)
112 self.checkexit(status, output)
112 self.checkexit(status, output)
113
113
114 def getchanges(self, rev):
114 def getchanges(self, rev):
General Comments 0
You need to be logged in to leave comments. Login now