1. TortoiseHg
  2. TortoiseHg
  3. thg
  4. Issues
Issue #70 resolved

Merge with changes in Working directory - force loses changes

Mike Wilkes
created an issue

I know, I shouldn't be working this way, but....

Using:tortoisehg-1.9.1-hg-1.7.3+f3058dd05281-x64.msi

Had minor local changes. Incoming changesets pulled. Did merge. Dialog warns, and gives options. Checked the 'force a merge with outstanding changes'.

Started the merge, but in status dialog, hg complained there were outstanding changes.

Working directory changes are now gone, so appears to have done an update, and aborted the merge.

Comments (2)

  1. Steve Borho

    I think that is the expected failure mode, when the merge command fails, to reset and go back to the first page.

    There was indeed a bug that prevented --force from being added to the merge command line. I believe I've now fixed it with af6f8d46d324

  2. Log in to comment