[darcs-devel] [patch2020] rebase unsuspend: start at the beginning when extracting

Ganesh Sittampalam bugs at darcs.net
Sat May 9 16:38:24 UTC 2020


New submission from Ganesh Sittampalam <ganesh at earth.li>:

As discussed in the thread "FullUnwind rebase behavior",
I think this change may sort out the problems with
unsuspending conflicts+their resolutions.

1 patch for repository darcs-unstable at darcs.net:screened:

patch 1a2d291109d8b59f4b8d623647341e7e15f1b834
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sat May  9 17:38:28 BST 2020
  * rebase unsuspend: start at the beginning when extracting
  
  As the new comment explains, it's important to simplify any
  fixups that result from extracting the first patch, before
  extracting the next patch.
  
  As the associated test shows, this in particular makes
  unsuspending a conflict along with its resolution behave much
  better.

----------
files: patch-preview.txt, rebase-unsuspend_-start-at-the-beginning-when-extracting.dpatch, unnamed
messages: 22015
nosy: ganesh
status: needs-screening
title: rebase unsuspend: start at the beginning when extracting

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch2020>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 6627 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20200509/443530cd/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: rebase-unsuspend_-start-at-the-beginning-when-extracting.dpatch
Type: application/x-darcs-patch
Size: 38750 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20200509/443530cd/attachment-0003.bin>
-------------- next part --------------
.







More information about the darcs-devel mailing list