On Wed, Sep 23, 2009 at 9:35 PM, Yuki KODAMA <endflow....@gmail.com> wrote: > On Thu, Sep 24, 2009 at 03:53, Adrian Buehlmann <adr...@cadifra.com> wrote: >> On 23.09.2009 12:56, Yuki KODAMA wrote: >>> # HG changeset patch >>> # User Yuki KODAMA <endflow....@gmail.com> >>> # Date 1253703176 -32400 >>> # Node ID f27bbcd4e43a43680c6c099da3737497274b4bea >>> # Parent 805554cc13d85d6cebd468c213290f35f3e0ce2c >>> update: introduce 'interactive update' feature >>> >> >> I just tried to update from revision 9 (with local changes) >> to 10 in one of my testrepos: >> >> o 10[tip] 8259c85feaea 2009-05-26 00:19 +0200 adrian >> | asdfasdf jhkjh kjh kjh kh >> | >> @ 9:2 8543d383a48c 2009-05-18 20:09 +0200 adrian >> | bla >> | >> | o 8 8a95cedf2508 2009-05-18 16:02 +0200 adrian >> | | bla >> | | >> | o 7 0c1e563afa29 2009-05-18 15:19 +0200 adrian >> | | bla >> | | >> | o 6 e372e710ca91 2009-05-18 14:34 +0200 adrian >> | | bla >> | | >> | o 5 92e3c70865ac 2009-05-17 10:48 +0200 adrian >> | | yyyy >> | | >> | o 4 e7435c101f4a 2009-05-15 19:38 +0200 adrian >> | | xx >> | | >> | o 3 d3c47c9445ce 2009-05-02 16:08 +0200 adrian >> |/ mbla >> | >> o 2 afb8baad5218 2009-04-24 21:44 +0200 adrian >> | bla >> | >> >> What I got is the dialog: >> >> Detected uncommitted local changes in working tree. >> Please select to continue: >> >> Discard - discard local changes, no backup >> Shelve - launch Shelve tool and continue >> >> ( Discard ) ( Shelve ) ( Cancel ) >> >> I do miss the "Allow merge with local changes" there >> (plain 'hg up' with no options). >> >> > > Confirmed this problem in local. I'll fix. > Thanks for early reviewing!
I like the new layout, but we need a better phrase for 'Ways' -- Steve Borho ------------------------------------------------------------------------------ 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
