[darcs-devel] [patch1202] generalise applyPatchesForRebase along t... (and 3 more)

Ganesh Sittampalam bugs at darcs.net
Wed Oct 22 07:56:24 UTC 2014


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

This sequence of patches adds a 'rebase apply' command, along the same
lines as 'rebase pull', i.e. it suspends any local patches that are in 
conflict with the bundle. 

I'm going to leave it in-discussion for a few days as I have some
reservations about the abstraction in the second patch below.

This bundle follows on from patch1201.

4 patches for repository darcs-unstable at darcs.net:screened:

Tue Oct 21 20:55:33 BST 2014  Ganesh Sittampalam <ganesh at earth.li>
  * generalise applyPatchesForRebase along the same lines as applyPatches

Wed Oct 22 01:22:50 BST 2014  Ganesh Sittampalam <ganesh at earth.li>
  * reuse the standard pullCmd for rebase
  
  This involves a rather complicated abstraction that would be major overkill
  for the approximately 6 lines of copy and pasted code that it saves.
  
  However it should extend to applyCmd, which is substantially bigger.
  

Wed Oct 22 01:55:42 BST 2014  Ganesh Sittampalam <ganesh at earth.li>
  * switch applyCmd to use the PatchApplier abstraction

Wed Oct 22 08:34:48 BST 2014  Ganesh Sittampalam <ganesh at earth.li>
  * resolve issue2409: implement darcs rebase apply

----------
files: generalise-applypatchesforrebase-along-the-same-lines-as-applypatches.dpatch, patch-preview.txt, unnamed
messages: 17713
nosy: ganesh
status: needs-screening
title: generalise applyPatchesForRebase along t... (and 3 more)

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1202>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 26428 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20141022/64385b96/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: generalise-applypatchesforrebase-along-the-same-lines-as-applypatches.dpatch
Type: application/x-darcs-patch
Size: 53056 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20141022/64385b96/attachment-0003.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: unnamed
Type: application/octet-stream
Size: 5 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20141022/64385b96/attachment-0001.obj>


More information about the darcs-devel mailing list