[darcs-devel] [issue2682] conflict not marked if tag pulled at the same time

[James Cook]

New submission from James Cook <falsifian at falsifian.org>:

1. Summarise the issue (what were doing, what went wrong?)

I pulled a change which introduced a conflict. The pull succeeded silently, and Darcs did 
not tell me about the conflict or mark it in the file.

This seems to happen when, within the same pull command, I also pull a tag depending on the 
conflicting patch. (I haven't verified that the tag needs to depend on the patch to trigger 
it.)

Here is a script which reproduces the issue for me:

    # Create repositories "a" and "b"; "b" is a clone of a.
    mkdir a
    cd a
    darcs init
    echo initial>file
    darcs add file
    darcs record -am initial
    cd ..
    darcs clone a b
    
    # Record a change followed by a tag in a.
    cd a
    echo a > file
    darcs record -am a
    darcs tag 'tag a'
    
    # Record a conflicting change in b.
    cd ../b
    echo b > file
    darcs record -am b
    
    # Pull from a to b.
    #
    # This is where the bug appears: darcs should say there's a conflict and
    # mark it, but instead the pull silently succeeds.
    darcs pull -a


2. What behaviour were you expecting instead?

The output of "darcs pull" should tell me about the conflict, and the conflict should be 
marked in file.

3. What darcs version are you using? (Try: darcs --exact-version)

falsifian angel-dfly b $ darcs --exact-version
darcs compiled on Jun 14 2021, at 17:17:37

Weak Hash: not available

Context:


[TAG 2.16.3
Ben Franksen <ben.franksen at online.de>**20201022094642
 Ignore-this: 
bd76d7e31488721e4a5ce7267115e71c3b68d680c155c75c3dd275d9e54933a607d208fab502a143
] 

4. What operating system are you running?

falsifian angel-dfly b $ uname -a
DragonFly angel-dfly.falsifian.org 6.1-DEVELOPMENT DragonFly v6.1.0.83.g556042-DEVELOPMENT 
#0: Thu Jun 17 21:01:19 UTC 2021     build at angel-
dfly.falsifian.org:/usr/obj/usr/src/sys/X86_64_GENERIC  x86_64

----------
messages: 22897
nosy: falsifian
priority: bug
status: unknown
title: conflict not marked if tag pulled at the same time

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