[Svnmerge] phantom revisions in Commit messages

[Raman Gupta]

Piet-Hein Peeters wrote:
> Hello,
> 
> I would really like to see the patch below committed in svnmerge.py.
> Can somebody please give me an update if and when this is going to happen?

Sorry Piet-Hein, this fell through the cracks. I updated the patch a 
little bit... if no one shouts in the next day or so I will commit it.

Cheers,
Raman Gupta

[[[
Do not show phantom revisions in the default svnmerge.py commit
log message.

* contrib/client-side/svnmerge.py
   (action_merge): Do not include phantom revs in the log message
     for merged revisions or for record-only revisions.
]]]

Index: svnmerge.py
===================================================================
--- svnmerge.py (revision 28274)
+++ svnmerge.py (working copy)
@@ -1354,10 +1354,10 @@
          f = open(opts["commit-file"], "w")
          if record_only:
              print >>f, 'Recorded merge of revisions %s via %s from ' % \
-                  (revs | phantom_revs, NAME)
+                  (revs, NAME)
          else:
              print >>f, 'Merged revisions %s via %s from ' % \
-                  (revs | phantom_revs, NAME)
+                  (revs, NAME)
          print >>f, '%s' % opts["source-url"]
          if opts["commit-verbose"]:
              print >>f