On Fri, Jan 8, 2010 at 11:27 AM, John Sparrow <johnsparro...@hotmail.co.uk> wrote: > > Question about the THg repository itself. I'm curious about how the 'stable' > and 'default' branches work in practice. Any resources you can point me to? > > Specifically, it looks like the stable branch is repeatedly merged into > default (I would have expected the other way around?). > > So how are new features in 'default' added to 'stable'? Transplanting?
default is a superset of the stable branch. Bug fixes are made to stable and then merged into the default branch. On releases, the stable branch is merged with the default branch. The only difference between these two merges (bug fix and release) are the order of the parents and the branch name given to the merge result. For bug fix merges, default branch is p0 and stable branch is p1 and the resulting changeset is on the default branch. For release merges, stable is p0 and default is p1, and the resulting changeset is on the stable branch. FWIW: Mercurial also began following this model after hg 1.4 was released. -- Steve Borho ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Tortoisehg-discuss mailing list Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss