[darcs-devel] [patch1902] add failing test for rebase of conflicted patches

[Ben Franksen]

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

Further extended the test. It passes with your latest bundle. I think I will
squash the patches that are not in screened yet (i.e. all except the initial
one) and screen that. When your rebase changes land in screened we should
remember to rename away the "failing-" prefix.

Or should I open an issue for this?

4 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 ea0257377ff17c07cfd19cc652c8c8a0e0bf379f
Author: Ben Franksen <ben.franksen at online.de>
Date:   Wed Sep  4 10:02:43 CEST 2019
  * extend tests/failing-rebase-conflicted-patches.sh to test three-way conflict

patch fadab3e32d43eb80e0a9840be7d527316287967f
Author: Ben Franksen <ben.franksen at online.de>
Date:   Wed Sep  4 11:31:46 CEST 2019
  * remove the extra 'y' which is no longer needed

patch 22b540ef77c3b3e99409453f50aef6dc42164718
Author: Ben Franksen <ben.franksen at online.de>
Date:   Wed Sep  4 11:40:33 CEST 2019
  * add one more three-way conflict test; also test more strictly

__________________________________
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: 5258 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190904/d38b97f5/attachment.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: 5986 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190904/d38b97f5/attachment-0001.bin>
-------------- next part --------------
.