On Fri, Nov 27, 2009 at 11:00 AM, Yuki KODAMA <endflow....@gmail.com> wrote:
> On Sat, Nov 28, 2009 at 01:39, Adrian Buehlmann <adr...@cadifra.com> wrote:
>> On 27.11.2009 17:10, Yuki KODAMA wrote:
>>> On Sat, Nov 28, 2009 at 00:52, Adrian Buehlmann <adr...@cadifra.com> wrote:
>>>> I currently sometimes see the change message text written twice in the
>>>> changeset info in the log viewer (using current default tip).
>>>>
>>>> For example I see
>>>>
>>>> '''
>>>> shellext: update README.txt to use "Microsoft Windows SDK for Windows 7"
>>>>
>>>> removing instructions for mingw32 compiler, which is no longer
>>>> supportedshellext: update README.txt to use "Microsoft Windows SDK for
>>>> Windows 7"
>>>>
>>>> removing instructions for mingw32 compiler, which is no longer supported
>>>> '''
>>>>
>>>> When selecting the changeset 5ca61395eec2 of the TortoiseHg
>>>> repo itself.
>>>>
>>>> I haven't yet found out when and why this happens, but it seems it has
>>>> to do with using mq.
>>>
>>> Me too. stable tip works well.
>>>
>>
>> Very strange.
>>
>> It seems this merge changeset is needed to have the bug:
>>
>> changeset: 5019:3af85f5c10d1
>> parent: 5009:27a0f2d22ddf
>> parent: 5018:4395e2ee6c5f
>> user: Steve Borho <st...@borho.org>
>> date: Thu Nov 26 09:47:03 2009 -0600
>> summary: Merge with stable
>>
>> Can this theory be correct?
>>
>> All my experiments lead to this.
>>
>
> Ah, Sune's changes (529de39db722) and my changes (79ce52d8945c) are mixed.
> In default tip line 292 of changeset.py:
> buf.insert(eob, desc.rstrip('\n\r') + '\n\n')
>
> There are codes (line 274 - 291) to insert issue tracker links before line
> 292.
> So line 292 conflicts with that code block. It can not be simply removed.
Yeah, I just found this myself. Merges from stable to default have
been non-trivial lately. I botched this one.
It doesn't look too difficult to fix.
--
Steve Borho
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
