From: W. Trevor King <wking@drexel.edu>
Date: Fri, 31 Jul 2009 08:57:32 +0000 (-0400)
Subject: Removed libbe.bzr.Bzr's automerge on post-commit.
X-Git-Tag: 1.0.0~62^2~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11d3b00bf4c12446dafeb3cfde9d0ae40608a85d;p=be.git

Removed libbe.bzr.Bzr's automerge on post-commit.

I'd done this already in
  wking@drexel.edu-20090723154304-swmkxpfagdzff9ai
but for some reason the merge with the email branch brought it back.
---

diff --git a/libbe/bzr.py b/libbe/bzr.py
index 7457815..9eb7de6 100644
--- a/libbe/bzr.py
+++ b/libbe/bzr.py
@@ -101,20 +101,6 @@ class Bzr(RCS):
         if index >= 0:
             return str(index+1) # bzr commit 0 is the empty tree.
         return str(current_revision+index+1)
-    def postcommit(self):
-        try:
-            self._u_invoke_client('merge')
-        except rcs.CommandError, e:
-            if ('No merge branch known or specified' in e.err_str or
-                'No merge location known or specified' in e.err_str):
-                pass
-            else:
-                self._u_invoke_client('revert',  '--no-backup', 
-                                   directory=directory)
-                self._u_invoke_client('resolve', '--all', directory=directory)
-                raise
-        if len(self._u_invoke_client('status', directory=directory)[1]) > 0:
-            self.commit('Merge from upstream')
 
     
 rcs.make_rcs_testcase_subclasses(Bzr, sys.modules[__name__])