On Sun, Sep 20, 2009 at 22:49, Adrian Buehlmann <adr...@cadifra.com> wrote:
> On 20.09.2009 15:13, Yuki KODAMA wrote:
>> On Sun, Sep 20, 2009 at 21:57, Adrian Buehlmann <adr...@cadifra.com> wrote:
>>> On 20.09.2009 14:50, Adrian Buehlmann wrote:
>>>> # HG changeset patch
>>>> # User Adrian Buehlmann <adr...@cadifra.com>
>>>> # Date 1253450925 -7200
>>>> # Node ID 84df13e80c5eee238356361fd99985f3786d3e1c
>>>> # Parent b8a2b89251691c39ab34f64309192caca9f7ce55
>>>> update: do not show "Parent 2" if there is none, reorder labels
>>>>
>>> Apologies for sending all patches piecemeal. I didn't intend
>>> to do that much when I started :)
>>>
>>> I've pushed everything up to this one to:
>>> http://bitbucket.org/abuehl/thg-abuehl/changeset/84df13e80c5e/
>>>
>>> A screenshot for how the dialog looks like with this:
>>> http://bitbucket.org/abuehl/thg-abuehl/downloads/update-84df13e80c5e.png
>>
>> Pretty good. Nice work, Adrian.
>> I just started my work ("interactive update") based on these changesets :)
>
> Sounds good.
>
> I was thinking about automatically setting the option
> radio button to "--check", if the update crosses branches.
>
> But it felt a bit like duplicating the code of merge.py
> of mercurial (prepare phase) and then my motivation dropped suddenly :)
Umm... indeed. But I think this feature will be a killer feature of THG.
As Steve said, Mercurial can't have these smart update features.
Especially, I don't prefer the behavior that attempting merge with local
changes on Mercurial. It'll surprise the user I think.
> And there is some hope that Stuart W Marks' patches pending in
> -mercurial-devel will make it into mercurial ("update: allow branch crossing
> without -c or -C")
No comment. Now I'm reading discussion about this on ML :)
Thanks for interesting things.
>> BTW, can I replace parent info with changesetinfo component later?
>
> Why not? Sounds interesting. How does it look like?
Maybe I won't change it any more in appearance.
I want to to forward applying embeddable component on THG.
Now we have changesetinfo & MQWidget as embeddable component.
But I know changesetinfo is not generalized enough yet.
> Does it handle the merge case?
> (http://bitbucket.org/abuehl/thg-abuehl/downloads/update-84df13e80c5e-merge.png)
>
>> Actual changesetinfo doesn't have ability you want, but I have a plan
>> to improve that component so that used in many situations.
>> It can be also used in Commit log.
>
> I assume "Commit log" = "hgtk log"?
Sorry, I wanted to say "Commit dialog" (hgtk commit), not "hgtk log".
In the bottom of Commit dialog, there is parent info frame that similar to
parent info you made in Update dialog.
--
Yuki KODAMA
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
