From a0bae2ab52fbf9186028c6b2860ec03753e702ef Mon Sep 17 00:00:00 2001 From: "Dr. Peter Poeml" Date: Wed, 26 Mar 2008 16:11:11 +0000 Subject: [PATCH] osc update: fix diff3 merging for expanded links, by adding the revision to the get_source_file() call in the mergfile method. --- osc/core.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osc/core.py b/osc/core.py index 38a843b8..b04527b9 100755 --- a/osc/core.py +++ b/osc/core.py @@ -755,7 +755,8 @@ class Package: os.rename(filename, myfilename) mtime = self.findfilebyname(n).mtime - get_source_file(self.apiurl, self.prjname, self.name, n, targetfilename=upfilename) + get_source_file(self.apiurl, self.prjname, self.name, n, + revision=self.rev, targetfilename=upfilename) os.utime(upfilename, (-1, mtime)) if binary_file(myfilename) or binary_file(upfilename):