On Wed, Aug 15, 2012 at 7:36 AM, Peter M Abraham <[email protected]> wrote: > HI Dan: > > I did the following: > > /usr/local/bin/hg pull && /usr/local/bin/hg update > > What would I change above to include a merge or do a merge instead? > > Thank you. > '
If you changed the source before doing the pull it should tell you to do a merge instead of an update. But it's pretty much that simple hg pull && hg merge I think trying to do an update when a merge is necessary should provide an error. This is in a test repo: [ddp@arrakis] :; hg pull pulling from /tmp/test searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) [ddp@arrakis] :; hg update abort: crosses branches (merge branches or update --check to force update) [ddp@arrakis] :; hg merge merging test warning: conflicts during merge. merging test incomplete! (edit conflicts, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [ddp@arrakis] :; hg resolve --all merging test warning: conflicts during merge. merging test incomplete! (edit conflicts, then use 'hg resolve --mark') [ddp@arrakis] :; vi test test now looks like: <<<<<<< local test2 test2 test2 ======= test test test tset tset tset >>>>>>> other The top is from the current repository (the local one I pulled to), and the bottom is from the remote upstream repo. I adjust to put what I want in there, deleting the <<<, >>>, and === lines. Then: [ddp@arrakis] :; hg resolve --mark test [ddp@arrakis] :; hg commit -m merge [ddp@arrakis] :; echo $? 0
