Skip to content
  • Martin von Zweigbergk's avatar
    merge: refuse update/merge if there are unresolved conflicts (BC) · 777f668eca70
    Martin von Zweigbergk authored
    We currently allow updating and merging (with --force) when there are
    unresolved merge conflicts, as long as there is only one parent of the
    working copy. Even worse, when updating to another revision
    (linearly), if one of the unresolved files (including any conflict
    markers in the working copy) can now be merged cleanly with the target
    revision, the file becomes marked as resolved.
    
    While we could potentially allow updates that affect only files that
    are not in the set of unresolved files, that's considerably more work,
    and we don't have a use case for it anyway. Instead, let's keep it
    simple and refuse any merge or update (without -C) when there are
    unresolved conflicts.
    
    Note that test-merge-local.t explicitly checks for conflict markers
    that get carried over on update. It's unclear if that was intentional
    or not, but it seems bad enough that we should forbid it. The simplest
    way of fixing the test case is to leave the conflict markers in place
    and just mark the files resolved, so let's just do that for now.
    777f668eca70