Patchwork [1,of,2] test-obsolete: explicitly show which changesets are divergent

login
register
mail settings
Submitter Greg Ward
Date June 24, 2014, 2:05 a.m.
Message ID <374720e271cc6b9bae87.1403575539@lucifer.gerg.ca>
Download mbox | patch
Permalink /patch/5049/
State Accepted
Headers show

Comments

Greg Ward - June 24, 2014, 2:05 a.m.
# HG changeset patch
# User Greg Ward <greg@gerg.ca>
# Date 1403571837 14400
#      Mon Jun 23 21:03:57 2014 -0400
# Node ID 374720e271cc6b9bae878bc05dd6e2cd3ffa7af1
# Parent  85d213215d2ccb43f0b8e4deaf9e857fe3358788
test-obsolete: explicitly show which changesets are divergent
Greg Ward - June 24, 2014, 2:14 a.m.
On 23 June 2014, Cc mercurial-devel@selenic.com said:
> # HG changeset patch
> # User Greg Ward <greg@gerg.ca>
> # Date 1403571837 14400
> #      Mon Jun 23 21:03:57 2014 -0400
> # Node ID 374720e271cc6b9bae878bc05dd6e2cd3ffa7af1
> # Parent  85d213215d2ccb43f0b8e4deaf9e857fe3358788
> test-obsolete: explicitly show which changesets are divergent

Argh! I forgot "--flag evolve_ext" on these two. Sorry.

(Does anyone else wish that you could put a flag into patchbomb
config? E.g. I would configure "email.flag = evolve_ext" in my clone
of marmoute's mutable-history repo.)

       Greg
Pierre-Yves David - June 26, 2014, 2:40 p.m.
On 06/24/2014 03:14 AM, Greg Ward wrote:
> On 23 June 2014, Cc mercurial-devel@selenic.com said:
>> # HG changeset patch
>> # User Greg Ward <greg@gerg.ca>
>> # Date 1403571837 14400
>> #      Mon Jun 23 21:03:57 2014 -0400
>> # Node ID 374720e271cc6b9bae878bc05dd6e2cd3ffa7af1
>> # Parent  85d213215d2ccb43f0b8e4deaf9e857fe3358788
>> test-obsolete: explicitly show which changesets are divergent

Those are queued, thanks

>
> Argh! I forgot "--flag evolve_ext" on these two. Sorry.
>
> (Does anyone else wish that you could put a flag into patchbomb
> config? E.g. I would configure "email.flag = evolve_ext" in my clone
> of marmoute's mutable-history repo.)

Sounds like a good ide, go for it.

Patch

diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -522,6 +522,9 @@ 
 #excluded 'whole rebase set is extinct and ignored.' message not in core
   $ hg rebase -b '3' -d 4 --traceback
   2 new divergent changesets
+  $ hg --hidden log -q -r 'successors(3)'
+  4:725c380fe99b
+  10:2033b4e49474
   $ hg up tip
   ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
   $ hg log -G --template='{rev} - {node|short} {desc}\n'