On Tue, May 13, 2014 at 10:01 AM, Yuya Nishihara <[email protected]> wrote: > On Mon, 12 May 2014 16:52:11 +0200, STF wrote: >> Sorry if my post is too naive to you. I'm a converted SVN user and I'm >> still a newbie in Hg, its workflow and the conceptual differences from SVN. >> >> >From the following page about the "default and stable branch" workflow: >> http://stevelosh.com/blog/2010/05/mercurial-workflows-stable-default/#stable-and-default-in-a-nutshell >> I understood (and it's written) that: >> "Each time you make a bug fix in stable you merge it into default, so >> default is always a superset of stable." >> >> On browsing through the source code of shellext repo inside tortoisehg >> account at this URL: >> https://bitbucket.org/tortoisehg/shellext/branches >> I have seen that the "default" is lagging behind the "stable" branch: >> default branch was last updated in 2012 but it's marked as "MAIN BRANCH". >> >> Is that intentional or some automatic tool has stopped working? > > I guess it was because there were no real change until 14ebabd1b8d1. > Maybe it's time to merge stable into default again?
Or just drop one of the branches, there is no active development. ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
