[darcs-devel] [issue1198] Reproducible "mergeConflictingNons failed in geteff with ix"

[Trent Buck]

New submission from Trent Buck <trentbuck at gmail.com>:

I can reproducibly generate the failure

    mergeConflictingNons failed in geteff with ix

by pulling a patch from my make branch to unstable, recording a
conflict resolution, then trying to pull the remaining patches.

    $ darcs get --lazy http://twb.ath.cx/darcs-unstable
    $ echo yd | darcs pull --repodir darcs-unstable http://twb.ath.cx/darcs-make
    $ darcs record -am x --no-test --repodir darcs-unstable
    $ darcs pull --all --repodir darcs-unstable http://twb.ath.cx/darcs-make

    darcs: mergeConflictingNons failed in geteff with ix
    {{
    |hunk ./GNUmakefile 39
    |+                ./src/Darcs/SlurpDirectory\
    |conflictor [
    |hunk ./GNUmakefile 39
    |+                ./src/Darcs/SlurpDirectory\
    |]
    ||:
    |hunk ./GNUmakefile 35
    |-SRC_DIRS:=. ./src ./src/Crypt\
    |-                ./src/Darcs\
    |-                ./src/Darcs/Commands\
    |-                ./src/Darcs/Repository\
    |-                ./src/Darcs/Patch\
    |-                ./src/win32\
    |-                ./src/win32/System\
    |-                ./src/win32/System/Posix\
    |+SRC_DIRS := . $(shell find src/ -name sys -prune -o -type d -print)
    |:
    hunk ./GNUmakefile 35
    -SRC_DIRS:=. ./src ./src/Crypt\
    -                 ./src/Darcs\
    -                 ./src/Darcs/Commands\
    -                 ./src/Darcs/Repository\
    -                 ./src/Darcs/Patch\
    -                 ./src/win32\
    -                 ./src/win32/System\
    -                 ./src/win32/System/Posix\
    +SRC_DIRS := . $(shell find src/ -name sys -prune -o -type d -print)
    |hunk ./GNUmakefile 35
    |-SRC_DIRS:=. ./src ./src/Crypt\
    |-                ./src/Darcs\
    |-                ./src/Darcs/Commands\
    |-                ./src/Darcs/Repository\
    |-                ./src/Darcs/Patch\
    |-                ./src/win32\
    |-                ./src/win32/System\
    |-                ./src/win32/System/Posix\
    |+SRC_DIRS := . $(shell find src/ -name sys -prune -o -type d -print)
    |:
    hunk ./GNUmakefile 35
    -SRC_DIRS := . $(shell find src/ -name sys -prune -o -type d -print)
    -
    |:
    hunk ./GNUmakefile 39
    +                 ./src/Darcs/SlurpDirectory\
    |:
    hunk ./GNUmakefile 35
    -SRC_DIRS:=. ./src ./src/Crypt\
    -                 ./src/Darcs\
    -                 ./src/Darcs/Commands\
    -                 ./src/Darcs/Repository\
    -                 ./src/Darcs/Patch\
    -                 ./src/win32\
    -                 ./src/win32/System\
    -                 ./src/win32/System/Posix\
    +SRC_DIRS := . $(shell find src/ -name sys -prune -o -type d -print)
    }}
    xx
    hunk ./GNUmakefile 35
    -SRC_DIRS:=. ./src ./src/Crypt\
    -                 ./src/Darcs\
    -                 ./src/Darcs/Commands\
    -                 ./src/Darcs/Repository\
    -                 ./src/Darcs/Patch\
    -                 ./src/win32\
    -                 ./src/win32/System\
    -                 ./src/win32/System/Posix\
    +v v v v v v v
    +*************
    +SRC_DIRS := . $(shell find src/ -name sys -prune -o -type d -print)

----------
messages: 6582
nosy: dagit, dmitry.kurochkin, kowey, simon, thorkilnaur, twb
status: unread
title: Reproducible "mergeConflictingNons failed in geteff with ix"

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue1198>
__________________________________