Hi,
In TortoiseHg Workbench it's possible to right click a revision and go 'Update'
then 'Merge' given the right scenario, or right click and choose 'Merge with
local'.
I've never been able to find documentation behind each and when to use one over
the other. Also, under what scenario does 'Not a head revision' appear? We only
occasionally see it (myself and 1 other on project), other times nothing. I'd
like to be able to explain it and educate others which to use but hard to find
info and reasoning which way to go.
I found this page below which had some info...
Url - http://ratfactor.com/mercurial-named-branches#pull-from-bitbucket
3 sentences of interest...
"After a pull, you're likely to see a "Not a head revision!" message on your
Working Directory."
"This is Mercurial's way of saying that the revision(s) you've just downloaded
from the Bitbucket repository are more recent than any you have committed to
the current branch in your local repository. There are two ways to fix this."
"If you have not made any commits since the last time you were synchronized
with Bitbucket, you can simply run an update to switch to this newer version.
See Switching branches ('updating'). Yes, this does mean that the act of
pulling new revisions created a new unnamed branch in your repository for that
purpose!"
I was playing around with those ideas. I cloned a default branch (filesystem
rather than http as a quick test), made a few changes to the clone, made
changes to the default master and commited, pulled the latest to the clone but
didn't see "not a head revision".
Any info greatly appreciated to help clear the confusion :) ...
Thanks
Peter
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
