Rebase failing, but then automatic merge doesn't show conflicts

Issue #12 on hold
Danny Tuppeny
created an issue

One of my colleagues has issues every time he tries to use RebaseIf. RebaseIf says there are conflicts, so aborts and does a merge, but the merge seems to run successfully (without opening a merge tool), but then outputs "about: outstanding uncommitted merges"!

{{{
C:>hg rb
pulling from w:\DMS\Mercurial\BCRM
searching for changes
adding changesets
adding manifests
adding file changes
added 5 changesets with 30 changes to 29 files (+1 heads)
merging MyWeb/MyWeb.csproj
merging MyWeb/PMS/Product.aspx.cs
merging Core/Core.csproj
merging Core/Core.csproj
warning: conflicts during merge.
merging Core/Core.csproj failed!
saved backup bundle to C:.hg\strip-backup\187c4044c44b-backup.hg
rebase aborted
rebaseif: failed to rebase, attempting merge
merging MyWeb/Product.aspx.cs
28 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
abort: outstanding uncommitted merges
C:>
}}}

Comments (8)

  1. Danny Tuppeny reporter

    Might be tricky to reproduce in a way I can send you, but I'll give it a go.

    I noticed the same file listed twice too - but I'm fairly new to DVCS so wasn't sure whether that was a problem or not.

  2. Danny Tuppeny reporter

    Apologies for not providing a better case. I've seen this a few times in the last few weeks, so I'll try and reproduce in a clean repo when I get a moment.

  3. Log in to comment