P3D4::Forced merge doesn't force merge.

Create issue
Issue #242 resolved
Zeno Amaro created an issue

Mercurial still complains about outstanding uncommitted changes.

Should be equivalent to doing a merge -f.

Comments (7)

  1. Jason Harris repo owner
    • changed status to open

    This might be happening if the status is messed up...

    Can I get you to confirm you are using MacHg 0.9.21 right? What operating system are you using?

    Can I get you to restart your machine? Also try using MacHg 0.9.20 again. Is it really the change MacHg 0.9.20 -> MacHg 0.9.21 which is causing all these problems?

    Merges and operations are working fine for me... I am only marking this as P3D3 since I can't reproduce these problems. Can anyone else reproduce these issues?

  2. Zeno Amaro reporter

    I'm using MacHg 0.9.21 on OSX 10.6. My machine is freshly rebooted.

    Forced merging has never ever worked for me. I use MacHg since a couple months. Steps to reproduce:

    1. Have uncommitted changes in the repo
    2. Open merge panel and select a revision/branch
    3. Check "force merge" and merge

    Expected results:

    "What will happen" text to change from "The revision selected above will be merged into current revision" to something like "The revision selected above will be forced to be merged into current revision".

    Merge the selected revision (even with outstanding uncommitted changes) as if `merge -f <revision/branch>` has been manually done.

    Actual results:

    "What will happen" text doesn't reflect the "force merge" checkbox value.

    Mercurial errors with:

    Mercurial reported error number 255:
    abort: outstanding uncommitted changes (use 'hg status' to list changes)

    Thank you, I hope this will be a more useful bug report.

  3. Jason Harris repo owner

    Ahhh... I can reproduce this. Thanks. Fix coming up... Could you similarly look at your other two reports.

  4. Zeno Amaro reporter

    I can confirm it fixes the forced merge issue, thank you! Also, mercurial is now listed as 1.8.2.

    Working on giving you the tests you asked for the other two issues. Thank you.

  5. Log in to comment