<Previous elided.>
I think you've got 2 different senses of synchronize there. One is the
command itself; the other is the sequence of operations that developers
would perform when aligning their code, which starts and ends with a
sync command and has other stuff--merging, testing, committing--in
between.
My guess is that the command ensures that each repository has the union
of the changesets of each. Or does it merge too? And perhaps it only
trades changesets that are relevant for the 2 respositories respective
tips?
I think you misunderstand what the Synchronize context menu does for you
in TortoiseHg. It isn't a command, but rather a popup dialog box. The
dialog box allows you to choose a remote repository and perform pull and
push commands. I do all my work from the Workbench, and haven't used
this. As such, I can't say with certainty that it doesn't merge, but I
don't see any capability to merge - if it's there, it's hidden. I'll
have to play with this and see what I can find out.
I just tested this: the synchronize dialog box that shows in response to
the synchronize context menu item does not allow for merges. It does not
allow for an Update, either, making it of limited use. If I were using
it, I'd have to define some hooks that did the update or merge after the
pull. Since a lot of what I do involves pushing changes to a centralized
NAS repo, where the update is defined in a hook, this would be a lot
quicker for doing a push, but not so useful for a pull. YMMV, but this
will leave the pulled changes in an isolated branch. I don't see any
context menu item that will allow you to resolve the two branches into a
single branch again.
<Remainder elided.>
------------------------------------------------------------------------------
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
