Mercurial > hg-stable
changeset 17241:c2f13180001f stable
histedit: end folding message with an LF
This is convenient when running tests dumping the editor content, it
avoids the following output line to be mixed with histedit message.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Wed, 25 Jul 2012 11:09:51 +0200 |
| parents | ffc49100151b |
| children | 336121088ef1 |
| files | hgext/histedit.py tests/test-histedit-fold-non-commute.t |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Tue Jul 24 12:36:40 2012 -0500 +++ b/hgext/histedit.py Wed Jul 25 11:09:51 2012 +0200 @@ -310,7 +310,7 @@ newmessage = '\n***\n'.join( [ctx.description()] + [repo[r].description() for r in internalchanges] + - [oldctx.description()]) + [oldctx.description()]) + '\n' # If the changesets are from the same author, keep it. if ctx.user() == oldctx.user(): username = ctx.user()
--- a/tests/test-histedit-fold-non-commute.t Tue Jul 24 12:36:40 2012 -0500 +++ b/tests/test-histedit-fold-non-commute.t Wed Jul 25 11:09:51 2012 +0200 @@ -91,6 +91,7 @@ does not commute with e + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved file e already exists 1 out of 1 hunks FAILED -- saving rejects to file e.rej