[PATCH resend] histedit: use descriptive comments to combine commit messages in fold

Dave S snidely.too at gmail.com
Tue Jan 15 12:39:47 CST 2013


On Tue, Jan 15, 2013 at 6:34 AM, Denis Laxalde <denis at laxalde.org> wrote:
> # HG changeset patch
> # User Denis Laxalde <denis at laxalde.org>
> # Date 1357565293 -3600
> # Node ID a522e70fa65d58f667bd8de4162c6eeb67f46b3a
> # Parent  83e8f22da9c2895f8cb0c7a8662e064477d63538
> histedit: use descriptive comments to combine commit messages in fold
>
> The combined template message resulting from a fold in histedit is made of
> comments (i.e. "HG: [...]") intercalated between commit messages of folded
> changesets instead of the previous "***".
>
> Tests updated.

Interesting.   Something about this patch confused Patchworks, and
right after these lines:

> $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
> +  saved backup bundle to
> $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg

All this stuff got left in the comments section, and not in the patch block:

>    $ hg log -G
> -  @  changeset:   1:e29e02896e6c
> +  @  changeset:   1:1990adcd9f2e
>    |  tag:         tip
>    |  user:        test
>    |  date:        Thu Jan 01 00:00:00 1970 +0000
> @@ -273,15 +280,17 @@ dropped revision.
>    # HG changeset patch
>    # User test
>    # Date 0 0
> -  # Node ID e29e02896e6c2b149d2228a0a64b4f3a9a4237f3
> +  # Node ID 1990adcd9f2efd3d9e758a6598af417ad5d0d806
>    # Parent  0189ba417d34df9dda55f88b637dcae9917b5964
>    +4
> -  ***
> +  +     +5.2
> -  ***
> +  +     +6
>    -  diff -r 0189ba417d34 -r e29e02896e6c file
> +  diff -r 0189ba417d34 -r 1990adcd9f2e file
>    --- a/file   Thu Jan 01 00:00:00 1970 +0000
>    +++ b/file   Thu Jan 01 00:00:00 1970 +0000
>    @@ -1,3 +1,6 @@


/dps

-- 
test signature -- please apply at front gate on Tuesdays only.


More information about the Mercurial-devel mailing list