minor cleanup/documentation

2 patches for repository darcs-unstable@darcs.net:screened:

patch 234d7a4f97c4bb1832da02bf005338bb9ee53cf9
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Tue Sep  3 12:17:45 BST 2019
  * add a basic test for darcs rebase changes

patch 66c51e0ded129f227f88984bfd04370b8945846b
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Tue Sep  3 15:05:34 BST 2019
  * simplify instance Summary RebaseChange
  
  I'm not sure why it was so complicated before. Perhaps
  changeAsMerge was used elsewhere at some point.
  
  Also removed the comment about resolveConflicts which
  doesn't make much sense now.

Attachments

• add-a-basic-test-for-darcs-rebase-changes.dpatch
• patch-preview.txt
• unnamed

A bit more detailed test that just the things in conflict
are marked, as I'm planning on refactoring the
code in a way that'd make it possible to get this wrong.

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

patch 1f421fa66ce31ecd65c11a17e0d168d6f8fd3bf2
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Wed Sep  4 15:46:58 BST 2019
  * add another test for rebase changes
  
  This checks that if some parts of the patch are in conflict
  and some aren't, that this is reported properly.

Attachments

• add-another-test-for-rebase-changes.dpatch
• patch-preview.txt
• unnamed

>   * add a basic test for darcs rebase changes>   * add another test for rebase changes
Both fine.

> patch 66c51e0ded129f227f88984bfd04370b8945846b
> Author: Ganesh Sittampalam <ganesh@earth.li>
> Date:   Tue Sep  3 15:05:34 BST 2019
>   * simplify instance Summary RebaseChange
>   
>   I'm not sure why it was so complicated before. Perhaps
>   changeAsMerge was used elsewhere at some point.
>   
>   Also removed the comment about resolveConflicts which
>   doesn't make much sense now.

I think this change is sound, but I wonder if it isn't still more
complicated than necessary. In particular, why do we have to commute
here at all? I thought we have a global rebase invariant that says
fixups are always pushed as far into rebase as possible? If this is
indeed the case, then we should be able to assume that we cannot commute
any of the fixups with the toedit patch.

>> patch 66c51e0ded129f227f88984bfd04370b8945846b
>> Author: Ganesh Sittampalam <ganesh@earth.li>
>> Date:   Tue Sep  3 15:05:34 BST 2019
>>   * simplify instance Summary RebaseChange
>>   
>>   I'm not sure why it was so complicated before. Perhaps
>>   changeAsMerge was used elsewhere at some point.
>>   
>>   Also removed the comment about resolveConflicts which
>>   doesn't make much sense now.
> 
> I think this change is sound, but I wonder if it isn't still more
> complicated than necessary. In particular, why do we have to commute
> here at all? I thought we have a global rebase invariant that says
> fixups are always pushed as far into rebase as possible? If this is
> indeed the case, then we should be able to assume that we cannot commute
> any of the fixups with the toedit patch.

Forget it. This comment applies to patch1914, not this one which is
fine. Will add the reply to the correct patch bundle.