mercurial at 27682: 72 new changesets (1 on stable)

[Pierre-Yves David]

On 01/08/2016 04:49 AM, Martin von Zweigbergk wrote:
> On Thu, Jan 7, 2016 at 4:01 PM, Mercurial Commits <hg at intevation.org> wrote:
>> http://selenic.com/repo/hg//rev/37d7cf569cf3
>> changeset:   27633:37d7cf569cf3
>> user:        Gregory Szorc <gregory.szorc at gmail.com>
>> date:        Sun Dec 20 11:56:24 2015 -0800
>> summary:     wireproto: support disabling bundle1 only if repo is generaldelta
>
> This is the broken incarnation of this patch that I fixed and pushed
> to the clowncopter, rewriting 47 changesets. This means that "make
> doc", and therefore "make install", currently does not build on @. I
> think that means there are 47 bumped changesets on the clowncopter.

I've applied emergency aid to the clowncopter. There is a single "fixup 
bumped changeset" under @ Martin, can you write a proper commit message 
for it ?

What I did is:

   $ hg pull main
   $ hg pull clown
   Boom, lots of troubled changeset
   $ hg evolve --bumped --rev MARTINREWRITENVERSION
   This created the fixup changeset
   # then assuming martin never changed anything to the 47 above that one
   $ hg prune --biject FIRSTMARTIN:: -s FIRSTMATT::LASTMATT

Then rebased the single dangling (bumped fixup) on top and pushed to the 
clowncopter.

-- 
Pierre-Yves David