[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-devel
Subject:    [darcs-devel] [issue2682] conflict not marked if tag pulled at the same time
From:       Ben Franksen <bugs () darcs ! net>
Date:       2021-07-05 13:03:15
Message-ID: ade8b1a6-cf59-877c-2625-68806e66a256 () online ! de
[Download RAW message or body]


Ben Franksen <ben.franksen@online.de> added the comment:

Turns out that the solution is simply to not use the instance Conflict 
(Named p). This makes sense, as we don't want to consider explicit 
dependencies anyway when we create the conflict markup for rebase unsuspend.

Will send a bundle that fixes this issue.

__________________________________
Darcs bug tracker <bugs@darcs.net>
<http://bugs.darcs.net/issue2682>
__________________________________
_______________________________________________
darcs-devel mailing list
darcs-devel@osuosl.org
https://lists.osuosl.org/mailman/listinfo/darcs-devel
[prev in list] [next in list] [prev in thread] [next in thread]