From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Mon, 19 May 2008 21:56:31 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.15-rc1~236
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/9564af74822b276d435319fc271eda591e5125a6?hp=--cc

Merge branch 'stable'
---

9564af74822b276d435319fc271eda591e5125a6
diff --cc stgit/commands/export.py
index 50f6f67,4e52598..6ebfd2a
--- a/stgit/commands/export.py
+++ b/stgit/commands/export.py
@@@ -88,9 -89,15 +88,10 @@@ def func(parser, options, args)
              os.makedirs(dirname)
          series = file(os.path.join(dirname, 'series'), 'w+')
  
 -    if options.diff_opts:
 -        diff_flags = options.diff_opts.split()
 -    else:
 -        diff_flags = []
 -
      applied = crt_series.get_applied()
+     unapplied = crt_series.get_unapplied()
      if len(args) != 0:
-         patches = parse_patches(args, applied)
+         patches = parse_patches(args, applied + unapplied, len(applied))
      else:
          patches = applied