[Python-Dev] Mercurial conversion repositories

Antoine Pitrou solipsis at pitrou.net
Sat Feb 26 06:36:17 CET 2011


On Sat, 26 Feb 2011 12:32:04 +1000
Nick Coghlan <ncoghlan at gmail.com> wrote:
> On Fri, Feb 25, 2011 at 10:19 AM, Antoine Pitrou <solipsis at pitrou.net> wrote:
> >    $ hg branches
> >    default                    68026:f12ef116dd10
> >    3.2                        68025:cef92ee1a323
> >    2.7                        68010:8174d00d0797
> >    3.1                        67955:5be8b695ea86
> >    2.6                        67287:5e26a860eded
> >    2.5                        65464:e4ecac76e499
> >    trunk                      62750:800f6c92c3ed
> >    3.0                        60075:1d05144224fe
> >    2.4                        58552:df72cac1899e
> >    2.3                        45731:a3d9a9730743
> >    2.2                        40444:d55ddc8c8501
> >    2.1                        30171:06fcccf6eca8
> >    2.0                        18214:dc0dfc9565cd
> >
> > The branch "default" is the current py3k branch from SVN. The branch
> > "trunk" represents SVN trunk history until 2.7 was branched for
> > maintenance.
> 
> Would it be possible to name "trunk" as "2.x" instead? Otherwise I
> could see people getting confused and asking why trunk was closed,
> and/or not the same as "default".

That was my first idea, but then I realized that the branch includes 1.x
and even pre-1.0 commits, so "2.x" might actually be more
confusing/misleading and hide the fact that the full trunk history is
there.

I think people should simply get used to the idea that "default" is
/the/ main branch in Mercurial (*). It's even easier to remember IMHO
("trunk" sounds a bit obscure at first, for a non-native English
speaker).

(*) but it's not any special really, it's just the branch you get by...
default ;)

Regards

Antoine.


More information about the Python-Dev mailing list