comparison mercurial/merge.py @ 31170:487ec7b096e2

merge: make "linear" an input in docstring table

Instead of having two ouputs, it seem simpler to have an addition
input. This will allow further simplification.

31169:955b3a6d3dd5

    is dirty, whether a revision is specified, and the relationship of
    the parent rev to the target rev (linear or not).

    This logic is tested by test-update-branches.t.

    -c  -C  dirty  rev  |  linear   non-linear
     n   n    n     n   |    ok         x
     n   n    n     y   |    ok        ok
     n   n    y     n   |   merge       x
     n   n    y     y   |   merge      (1)
     n   y    *     *   |   discard   discard
     y   n    y     *   |    (2)       (2)
     y   n    n     *   |    ok        ok
     y   y    *     *   |    (3)       (3)

    x = can't happen
    * = don't-care
    1 = abort: uncommitted changes (commit or update --clean to discard changes)
    2 = abort: uncommitted changes (checked in commands.py)

31170:487ec7b096e2

    is dirty, whether a revision is specified, and the relationship of
    the parent rev to the target rev (linear or not).

    This logic is tested by test-update-branches.t.

    -c  -C  dirty  rev  linear  |  result
     n   n    n     n     n     |     x
     n   n    n     n     y     |    ok
     n   n    n     y     *     |    ok
     n   n    y     n     n     |     x
     n   n    y     n     y     |   merge
     n   n    y     y     n     |    (1)
     n   n    y     y     y     |   merge
     n   y    *     *     *     |  discard
     y   n    y     *     *     |    (2)
     y   n    n     *     *     |    ok
     y   y    *     *     *     |    (3)

    x = can't happen
    * = don't-care
    1 = abort: uncommitted changes (commit or update --clean to discard changes)
    2 = abort: uncommitted changes (checked in commands.py)