[Svnmerge] svnmerge-commit-message.txt shows wrong information.

[Michael Willmott]

Daniel Rall wrote:
> This looks good to me.  Assuming Piet-Hein's tests pan out, +1 on
> committing it.

I actually prefer this patch, although it doesn't produce the changed 
revs only output that Piet-Hein wanted, it does eliminate all revs 
already merged.

Index: svnmerge.py
===================================================================
--- svnmerge.py (revision 25820)
+++ svnmerge.py (working copy)
@@ -1283,12 +1283,13 @@
      # Write out commit message if desired
      if opts["commit-file"]:
          f = open(opts["commit-file"], "w")
+        log_revs = merged_revs - opts["merged-revs"]
          if record_only:
              print >>f, 'Recorded merge of revisions %s via %s from ' % \
-                  (revs | phantom_revs, NAME)
+                  (log_revs, NAME)
          else:
              print >>f, 'Merged revisions %s via %s from ' % \
-                  (revs | phantom_revs, NAME)
+                  (log_revs, NAME)
          print >>f, '%s' % opts["source-url"]
          if opts["commit-verbose"]:
              print >>f

-- 
Michael Willmott