On February 13, 2011 11:17:04 am dmg wrote:
> >From what I have read, just use -f to force it.
> We just have to be careful when we check out to use the proper "tip".
"tip" is just a tag that get set on the latest commit. One should never check
out "tip". If you work on branch A and I work on branch B, if you are the
last committer "tip" will be branch A and if I am the last committer tip will
be branch B.
As a rule, you want to always `hg pull && hg up` before `hg push`.
If the system notifies you of multiple heads to the same branch, like in this
situation, you want to `hg merge` before pushing.
I just solved the problem with:
As a committer, you want to look at your own tree with `hg view`
It will show something like:
when you see unintended additional heads (i.e. if you have not branched out
and there are more heads), you want to go through `hg merge` and `hg ci`
@Jim: do you have access to "hg view" or something similar in TortoiseHg?
@Bruno: your two commits (added more files to the tarball; and updated
ChangeLog) where they really intended for the optimizeroptions branch? or for
the libpano branch?
when not sure on which branch you are:
hg banches - lists all branches
hg branch - tells you which branch you are on
hg up -C <BRANCHNAME> - puts you on that branch
I see only two branches inside the libpano repo:
I look forward to see PhotoshopPSB after Jim pushes it.
In "canonical" Hg repos there is a 'default' branch. The equivalent to SVN's
'trunk'. We don't have it here, so we have to double check on which branch we
are before making and committing changes.