From 4ec0b4fbe74aea9fa55bb2f1d82bbdef676eb6de Mon Sep 17 00:00:00 2001 From: "Dr. Peter Poeml" Date: Tue, 23 May 2006 09:59:22 +0000 Subject: [PATCH] fix status letter for files merged on update (in analogy to svn , it is either G or U) --- osc/commandline.py | 2 +- osc/core.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py index 4e160307..2b90abd8 100755 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -242,7 +242,7 @@ def main(): print statfrmt(status_after_merge, filename) elif state == 'M': p.updatefile(filename) - print statfrmt('M', filename) + print statfrmt('U', filename) elif state == '!': p.updatefile(filename) print 'Restored \'%s\'' % filename diff --git a/osc/core.py b/osc/core.py index 580aa071..5c63c6b7 100755 --- a/osc/core.py +++ b/osc/core.py @@ -213,7 +213,7 @@ class Package: os.rename(upfilename, filename) copy_file(filename, storefilename) os.unlink(myfilename) - return 'M' + return 'G' else: # unsuccessful merge self.in_conflict.append(n)