# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1327339330 -3600
# Node ID 3124889cad55776edddbe8a4721fc442fbac61c7
# Parent  b70fadbccc2a3be447987d50946d20687221c031
keep branch on amend

diff -r b70fadbccc2a -r 3124889cad55 hgext/evolution.py
--- a/hgext/evolution.py	Wed Jan 11 17:01:06 2012 +0100
+++ b/hgext/evolution.py	Mon Jan 23 18:22:10 2012 +0100
@@ -307,6 +307,9 @@
     branch = opts.get('branch')
     if branch:
         opts.setdefault('extra', {})['branch'] = branch
+    else:
+        if old.branch() != 'default':
+            opts.setdefault('extra', {})['branch'] = old.branch()
 
     lock = repo.lock()
     try:
diff -r b70fadbccc2a -r 3124889cad55 hgext/obsolete.py
--- a/hgext/obsolete.py	Wed Jan 11 17:01:06 2012 +0100
+++ b/hgext/obsolete.py	Mon Jan 23 18:22:10 2012 +0100
@@ -302,6 +302,8 @@
                 sub = None
             if obj in self._obssubrels.get(sub, set()):
                 return 0
+            if sub == obj:
+                return 0
             self._obssubrels.setdefault(sub, set()).add(obj)
             self._obsobjrels.setdefault(obj, set()).add(sub)
             try: