[darcs-devel] [patch1902] add failing test for rebase of conflicted patches
Ben Franksen
bugs at darcs.net
Wed Sep 4 17:19:44 UTC 2019
Ben Franksen <ben.franksen at online.de> added the comment:
I have opened issue2634 and the test now refers to it (only the last patch
is new).
2 patches for repository http://darcs.net/screened:
patch 0906a7f048a56cd9004825da1d467606ea4513d1
Author: Ben Franksen <ben.franksen at online.de>
Date: Tue Sep 3 22:31:17 CEST 2019
* improve and fix tests/failing-rebase-conflicted-patches.sh
We record the addfile separately and share it in order to give the conflict
markup a chance to restore the original changes made by patch 'one' and
'two'. Also refactor the tests a bit and fixed teh descriptions wich I mixed
up badly.
Finally and most importantly, test for the presence of the change made by
the remaining patch, not the one we obliterated.
patch 4f3306f41c0a0097c188a7053b0010d0f335935b
Author: Ben Franksen <ben.franksen at online.de>
Date: Wed Sep 4 19:22:17 CEST 2019
* renamed rebase-conflicted test to mention issue2634
__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1902>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 2741 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190904/ac3bdea5/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: improve-and-fix-tests_failing_rebase_conflicted_patches_sh.dpatch
Type: application/x-darcs-patch
Size: 3469 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190904/ac3bdea5/attachment-0003.bin>
-------------- next part --------------
.
More information about the darcs-devel
mailing list