7

We merge using this process:

cd c:\myapp
hg pull ssh://hg/myapp-1_0_1
hg merge

Now sometimes we mess up the merge or sometimes we get an error (ie: "can't merge file xxx - file in use"). Usually I just delete my c:\myapp repo, re-clone from the remote master repo and start over. This works but it's a pain. What is a better way?

I've read about using hg update -C but I'm not clear on the process. So you'd do hg update -C, this would delete the merged files but keep the changesets that were pulled down, and then you'd issue the hg merge command again and try again?

Update Regarding the related question: hg update -C still keeps the changesets in the repo which were pulled down with hg pull - how can you get rid of those?

Community
  • 1
  • 1
Marcus Leon
  • 55,199
  • 118
  • 297
  • 429

2 Answers2

14

hg update -C is just perfect. Why would you want to get rid of the pulled changesets? Because the update command updates to the head of the pulled changes? If this is your problem with the pulled changes, run hg update -C <revision-of-your-local-head> and don't care about the pulled changes, probably you'll pull them again at some point anyway. After the update proceed your work or try the merge again.

However, if your really want to get rid of pulled changes, use the strip command.

Vadim Kotov
  • 8,084
  • 8
  • 48
  • 62
Oben Sonne
  • 9,893
  • 2
  • 40
  • 61
3

See this post How to abandon a hg merge?

Community
  • 1
  • 1
Mikezx6r
  • 16,829
  • 7
  • 33
  • 31
  • 1
    My memory is not at its best today... When I saw this question I went looking through my own *asked* questions, because I knew I had asked it before. Apparently I had *answered* it. I think I need more coffee... – R. Martinho Fernandes Mar 17 '11 at 17:34