I use mercury. The main clone is called a "farm". I made a clone of this name "myfarm", which I am developing locally. Now I want to push the changes from my clone to a real clone hosted on googlecode.
So, in the context of my own clone "myfarm", I run [hg incoming farm]. This seems to be a list of all the changes that have been made to "farm" since I made my clone. Enumerates a bunch of things like:
changeset: 545:edfe4dadf
parent: 549:ea8e55929bcF
parent: 592:dfdf05dbcfA3
user: Some user
date: Some date
summary: Some comments
ok, then I ran [hg pull farm]. The following is left on the command line:
pulling from https://blah.googlecode.com/hg
searching for changes
adding changesets
adding manifests
adding file changes
added 6 changesets with 3 changes to 2 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
ok, so is all the merging already for me, or do I need to run [hg merge farm] now? How do I know if there are conflicts? If so, I'm also not sure what I need to run:
hg merge farm
hg merge
, pull, , .
svn, :
svn update (notified of merge changes)
svn ci