Xavier de Gaye wrote:
> > >> The 'vim73' branch can be given the name of the 'default' branch with
> > >> the 'hg branch --force default' command after the 'default' branch is
> > >> named 'vim72' with the 'hg branch vim72' command (both followed by
> > >> commit).
> > >> ...
> > >
> > > Now that I'm ready to make vim73 the default branch, it occurs to me
> > > that when I do this, doing "hg update vim73" will stop working.
> > >
> > > What I would like to do is keep the "vim73" label on the branch, but
> > > make it the default one.
> > >
> > > So currently:
> > >
> > > hg clone ... gives you the default branch, Vim 7.2.1234
> > > hg update vim73 switches to Vim 7.3
> > >
> > > What I would like to get:
> > >
> > > hg clone ... gives you the default branch, Vim 7.3.001
> > > hg update vim73 stays on the default branch
> >
> >
> > I understand that 'branch' is an attribute of a changeset with a
> > single value ('default' or 'vim73', but not both), so that it is not
> > possible to have 'hg update default' and 'hg update vim73' give the
> > same result.
> >
> >
> >
> > > hg update vim72 switches to Vim 7.2.1234
> > >
> > > Is that possible? Or does making vim73 the default branch always have
> > > the result that switching to the vim73 branch stops working?
> > >
> > > An acceptable alternative would be that the default branch has the
> > > latest version, including patches, while "vim73" is plain 7.3, no patches.
> >
> >
> > '"vim73" is plain 7.3, no patches' is what happens when the 'vim73'
> > branch is renamed the 'default' branch after the vim73 release have
> > been made.
> >
> > Attached is a shell script that creates a repository in a new
> > 'branch_test' directory and runs a sequence of hg commands that
> > reproduce what happens when branches are renamed this way. After the
> > script is run and cloning the repository, the cloned repo behaves as
> > in the "acceptable alternative" above.
Thanks. The shell script is especially useful to see what really
happens.
So it's not possible to have two branch names for the same version. I
think what you have done here is most likely the best solution. The
only other alternative I heard is merging the vim73 branch back into
default, but that has more chances of going wrong. And I don't really
seen an advantage, since all changes in the 7.2 branch (called default
until now) have been included in 7.3.
--
hundred-and-one symptoms of being an internet addict:
91. It's Saturday afternoon in the middle of May and you
are on computer.
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
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
