Mercurial > hg
diff mercurial/cmdutil.py @ 17932:c8ffde272653
Merge with crew-stable.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Tue, 13 Nov 2012 19:32:53 -0600 |
parents | 7f5dab94e48c 45bd0cd7ca04 |
children | 54f063acc5ea |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Tue Nov 13 13:09:42 2012 -0800 +++ b/mercurial/cmdutil.py Tue Nov 13 19:32:53 2012 -0600 @@ -1715,7 +1715,9 @@ user = opts.get('user') or old.user() date = opts.get('date') or old.date() + editmsg = False if not message: + editmsg = True message = old.description() pureextra = extra.copy() @@ -1729,7 +1731,8 @@ user=user, date=date, extra=extra) - new._text = commitforceeditor(repo, new, []) + if editmsg: + new._text = commitforceeditor(repo, new, []) newdesc = changelog.stripdesc(new.description()) if ((not node)