[PATCH 1 of 5 RFC] tests: show added/modified/removed files when logging repos converted from bzr

Matt Harbison mharbison72 at gmail.com
Sat Jul 28 11:46:44 EDT 2018


> On Jul 28, 2018, at 10:59 AM, Yuya Nishihara <yuya at tcha.org> wrote:
> 
>> On Sat, 28 Jul 2018 10:37:37 -0400, Matt Harbison wrote:
>> 
>>>> On Jul 28, 2018, at 3:05 AM, Yuya Nishihara <yuya at tcha.org> wrote:
>>>> 
>>>> On Fri, 27 Jul 2018 14:14:27 -0400, Matt Harbison wrote:
>>>> On Fri, 27 Jul 2018 14:10:08 -0400, Matt Harbison <mharbison72 at gmail.com>  
>>>> wrote:
>>>> 
>>>>> # HG changeset patch
>>>>> # User Matt Harbison <matt_harbison at yahoo.com>
>>>>> # Date 1531499586 14400
>>>>> #      Fri Jul 13 12:33:06 2018 -0400
>>>>> # Branch stable
>>>>> # Node ID 3da5d60bf6e7ad121cea897e2f59846007f3cc9f
>>>>> # Parent  0f948d821fe7e5ed18e6106c162375a11e8b0546
>>>>> tests: show added/modified/removed files when logging repos converted  
>>>>> from bzr
>>>> 
>>>> I know we're in the middle of a freeze, but I didn't get a chance to  
>>>> figure out this memctx status filtering.  I'm on vacation, so the chances  
>>>> of me getting back to it are quite slim.  Since it affects more than a  
>>>> corner case with convert[1], and it permanently affects the repo, it's  
>>>> probably worth someone who understands the status calculating to take a  
>>>> run at it.
>>>> 
>>>> [1]  
>>>> https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-July/118907.html
>>> 
>>> Does the hack in the previous thread solve your problem?
>> 
>> IIRC, the hack you posted just printed a message when the problem occurred- it didn’t try to fix it.  I remember running it, and I think the message came out a couple of times.  (I thought far fewer times than the number of commits that I had to hack to fix up, but it’s possible that this is a cascading problem.)  I don’t recall if it printed in the problem *.t test in this series.
> 
> Really. I saw several hash changes in test outputs including
> test-convert-bzr-merges.t, so I thought it would catch at least a certain
> type of manifest mis-reuse. Maybe there would be the other ones.

I’ll have to try it again, because I ran so many conversions I may be getting my wires crossed. But I won’t be back for another week.  There are some truly crazy things in this repo, like merging commits with their parent (it’s like this in the bar source).  So it may end up being a combination of things.


More information about the Mercurial-devel mailing list