Re: [RFC PATCH] Record a single transaction for conflicting push operations
From: Karl Wiberg <hidden>
Date: 2016-06-15 22:47:55
On Fri, Dec 18, 2009 at 4:49 PM, Catalin Marinas [off-list ref] wrote:
quoted hunk ↗ jump to hunk
@@ -371,12 +369,10 @@ class StackTransaction(object): # We've just caused conflicts, so we must allow them in # the final checkout. self.__allow_conflicts = lambda trans: True - - # Save this update so that we can run it a little later. - self.__conflicting_push = update + self.__patches = _TransPatchMap(self.__stack) + update() self.__halt("%d merge conflict(s)" % len(self.__conflicts)) else: - # Update immediately. update() def push_tree(self, pn):
Better. But couldn't you remove the update function completely and just inline the code in it, since it's called immediately? -- Karl Wiberg, kha@treskal.com subrabbit.wordpress.com www.treskal.com/kalle