On 20/08/10 17:48, Benjamin R. Haskell wrote:
On Fri, 20 Aug 2010, Tony Mechelynck wrote:
I can't see anything wrong:
- hg diff shows me no file differences between the latest two
changesets, which is the desired effect;
- hg heads shows only one head per branch, the "default" branch head
being the new changeset, which is again the desired effect;
- hg branches shows vim (near the base of the tree), vim72, vim73 and
default, each pointing to the expected changesets (the same ones as
shown by "hg heads"); the vim73 branch is listed as "inactive" because
it has a child (in the default branch). All this looks normal to me.
This seems abnormal to me, but it might be my own semantic dissonance
with hg...
Shouldn't current development be on the vim73 branch? Can the vim73
branch not be equivalent to the default branch? (Can a branch in hg
have multiple names?) Can the vim73 branch just be used as the default
(without calling it 'default')?
A changeset always belongs to exactly one named branch, so it is not
possible to make the default branch and the vim73 branch "equivalent".
(The default branch is also a named branch, it's just that the line
"branch: default" is omitted in hg log listings).
The Mercurial team "strongly recommends" that the default branch be the
code branch undergoing active development, where pushes will happen most
often.
I suppose that at the time of vim 7.2 vs. 7.3a branching, the branch
which was going to evolve into Vim 7.3 should have kept the "default"
branch name (and been seen as the "trunk"), while the 7.2 branch (which
would "die" after the 7.3 release) should have been named vim72 at that
point. For better or worse this is not what happened.
I would expect there to be a tag that could get you vim 7.3(.0.0) if you
wanted it, but it seems weird that there are new patches (releases) of
vim 7.3 with the vim73 branch being "inactive".
"inactive" means that it is not a topological head, i.e., this branch
head has one or more children in a different branch. This is because
development on the "vim73" named branch was halted when it was decided
to continue it as the (new) "default" branch.
The expression "inactive branch" is deprecated in current Mercurial
releases, now that it is possible to "close" a branch (by means of hg
commit --close-branch), which is a different thing.
For details, you may subscribe to the Mercurial mailing list, mercurial
-at- selenic.com; see http://selenic.com/mailman/listinfo/mercurial for
more info about that list. See also the Mercurial project site
http://mercurial.selenic.com/ and in particular the "Mercurial Guide"
http://mercurial.selenic.com/guide/
Best regards,
Tony.
--
Real programmers don't write in BASIC. Actually, no programmers write
in BASIC after reaching puberty.
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
