From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Thu, 17 Apr 2008 20:50:14 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.15-rc1~246
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/d851da81409f07105c55d5088157e276cbc4fe13?hp=-c

Merge branch 'stable'
---

d851da81409f07105c55d5088157e276cbc4fe13
diff --combined stgit/commands/sync.py
index 35c5c31,a04ff82..0e2c18f
--- a/stgit/commands/sync.py
+++ b/stgit/commands/sync.py
@@@ -57,7 -57,7 +57,7 @@@ def __branch_merge_patch(remote_series
      """Merge a patch from a remote branch into the current tree.
      """
      patch = remote_series.get_patch(pname)
 -    git.merge(patch.get_bottom(), git.get_head(), patch.get_top())
 +    git.merge_recursive(patch.get_bottom(), git.get_head(), patch.get_top())
  
  def __series_merge_patch(base, patchdir, pname):
      """Merge a patch file with the given StGIT patch.
@@@ -136,11 -136,13 +136,13 @@@ def func(parser, options, args)
          to_pop = applied[applied.index(first_patch) + 1:]
          if to_pop:
              pop_patches(crt_series, to_pop[::-1])
+         pushed = [first_patch]
      else:
          to_pop = []
+         pushed = []
      popped = to_pop + [p for p in patches if p in unapplied]
  
-     for p in [first_patch] + popped:
+     for p in pushed + popped:
          if p in popped:
              # push this patch
              push_patches(crt_series, [p])
@@@ -157,6 -159,7 +159,6 @@@
  
          # reset the patch backup information. That's needed in case we
          # undo the sync but there were no changes made
 -        patch.set_bottom(bottom, backup = True)
          patch.set_top(top, backup = True)
  
          # the actual merging (either from a branch or an external file)