Hi,
> http://onnv.sfbay/links/flagdays/pages/2008080502.html
This is public mailinglist, folks outside do not have access to SWAN.
Correct internal link would be rpe-scm-site-experts at sun.com .
> For the flag day above, what if I got 2 more heads in my workspace.
> What is the detailed steps to merge all of them? It seems that I merge a
> lot of strange files into my worksapce.
# check that you have no outstanding changes
$ hg status
# list all heads available
$ hg heads
# good practice is to switch to the 'official' head, but it's not
# necessary due to 'recommit' we are using
hg up -r 'official head revision'
# if you have 2 heads only
$ hg merge
# if you have more than two
$ hg merge -r 'revision of the head which should be merged into our current
head'
# commit the merge
$ hg commit -m "merge"
# repeat until there are more than two heads
# Get rid of merge changesets
hg recommit
# push
$ hg push ...
# If push fails because of outstanding changes
$ hg pull
and go to top of this mail :)
Hope this helps
--
Vlad
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 193 bytes
Desc: not available
URL:
<http://mail.opensolaris.org/pipermail/scm-migration-dev/attachments/20080912/5fb6f699/attachment.bin>
