Questions about branching in Mercurial
Mark A. Flacy
mflacy at verizon.net
Sun May 6 17:23:56 UTC 2007
On 2007.05.06 11:17, Marcin Kasperski wrote:
>
> Well, one can reasonably expect that if hi is using non-default
> branch, then the changes he makes do not apply to default branch (I
> use term 'branch' in general terms, not those specific to mercurial).
> According to the description above, it seems mercurial 'branch' is
> almost alias to 'tag'.
> Hard to say which command should work differently (maybe not 'branch',
> but 'merge'), but it is natural to expect that if I create branch (in
> version control terms), make and commit some changes, then revert to
> the main branch and ask for merge, then all the changes made on branch
> are put into default. Even if internally it means just moving
> 'default' mark to another changeset without true merge.
So let's say that we have one of these mega-repositories that contains
150 branches.
That's potentially 150 heads in the repository.
In that case, what do expect to happen when you enter "hg merge"?
More information about the Mercurial
mailing list