1

The left/right files in BeyondCompare merge are reversed when using hg fetch vs an hg pull + hg merge. Is there any reason for this? Is there a way to keep the same configuration?

Update:

Related question/answer: Completely manual Mercurial merge

Community
  • 1
  • 1
Marcus Leon
  • 55,199
  • 118
  • 297
  • 429
  • It's not the answer you want, but you really shouldn't use `fetch` -- it's disabled for a reason. Separating pulling and then updating or merging into separate actions allows both of them to give better output. Why should your file transfer be rolled back just because you abort a merge? – Ry4an Brase Jan 31 '11 at 18:35

1 Answers1

2

Yes, there's a reason. From hg help fetch:

When a merge occurs, the newly pulled changes are assumed to be "authoritative". The head of the new changes is used as the first parent, with local changes as the second. To switch the merge order, use --switch-parent.

This means a fetch is similar to the following manual workflow:

  1. pull
  2. update to new pulled head
  3. merge

Using the --switch-parent option skips step 2 and thus prevents a reversed merge.

Oben Sonne
  • 9,893
  • 2
  • 40
  • 61