From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Sun, 23 Nov 2008 21:20:59 GMT
Subject: Re: Stgit and refresh-temp
Message-ID: <b0943d9e0811231320s804eff0k5aecbac84cb2ffe7@mail.gmail.com>
In-Reply-To: <20081112101439.GA27469@diana.vm.bytemark.co.uk>

2008/11/12 Karl Hasselström <kha@treskal.com>:
> On 2008-11-12 10:02:10 +0000, Catalin Marinas wrote:
>
>> I think it's just a matter of updating HEAD on the "merge_conflict"
>> path but I'm still not fully confident in modifying the new lib
>> infrastructure.
>
> You're probably right.

The simple patch below seems to fix it the goto issue. Could you
please confirm its correctness (the patch might be wrapped by the web
interface)?

diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py
index 6623645..0f414d8 100644
--- a/stgit/lib/transaction.py
+++ b/stgit/lib/transaction.py
@@ -321,6 +321,7 @@ class StackTransaction(object):
         if any(getattr(cd, a) != getattr(orig_cd, a) for a in
                ['parent', 'tree', 'author', 'message']):
             comm = self.__stack.repository.commit(cd)
+            self.head = comm
         else:
             comm = None
             s = ' (unmodified)'

Thanks.

-- 
Catalin