From d9214fa60ea080bd10641bac61c962827d181552 Mon Sep 17 00:00:00 2001 From: Aaron Bentley Date: Fri, 3 Feb 2006 16:00:26 -0500 Subject: [PATCH] Fixed merge change detection --- libbe/bzr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libbe/bzr.py b/libbe/bzr.py index c6fc622..d68776d 100644 --- a/libbe/bzr.py +++ b/libbe/bzr.py @@ -118,12 +118,12 @@ def commit(directory, summary, body=None): def postcommit(directory): try: - status = invoke_client('merge', directory=directory) + invoke_client('merge', directory=directory) except CommandError: status = invoke_client('revert --no-backup', directory=directory) status = invoke_client('resolve --all', directory=directory) raise - if status == 1: + if len(invoke_client('status', directory=directory)[1]) > 0: commit(directory, 'Merge from upstream') name = "bzr" -- 2.26.2