This looks good to me. Assuming Piet-Hein's tests pan out, +1 on committing it.
On Mon, 30 Jul 2007, Piet-Hein Peeters wrote: > > Thanks for this patch, > > I'll test it and let you know. > > Alan wrote: > On Sat, 28 Jul 2007, Dustin J. Mitchell wrote: > > On Sat, Jul 28, 2007 at 11:42:08AM +0200, Alan Barrett wrote: > > > I patched my copy of svnmerge.py long ago to prevent it from listing > > > phantom revisions in the log message. > > > > I think the case has now been made for this change. Is there any > > chance you would want to make your patch available? > > It's only one line, and it doesn't do anything like what I suggested in > my previous message; all it does is omit the phantom revisions from the > log message. Here's the patch: > > --- svnmerge.py > +++ svnmerge.py > @@ -1084,7 +1084,7 @@ > (revs | phantom_revs, NAME) > else: > print >>f, 'Merged revisions %s via %s from ' % \ > - (revs | phantom_revs, NAME) > + (revs, NAME) > print >>f, '%s' % opts["head-url"] > if opts["commit-verbose"]: > print >>f
pgpEVzegu1t7b.pgp
Description: PGP signature
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
