darcs

Patch 1713 D.R.Merge: improved docs, local variable renamings, etc

Title D.R.Merge: improved docs, local variable renamings, etc
Superseder Nosy List bf
Related Issues
Status accepted Assigned To
Milestone

Created on 2018-07-18.20:15:38 by bf, last changed 2018-08-13.07:00:01 by ganesh.

Files
File name Status Uploaded Type Edit Remove
explain-how-tentativelymergepatches-works.dpatch bf, 2018-07-18.20:15:38 text/x-darcs-patch
See mailing list archives for discussion on individual patches.
Messages
msg20210 (view) Author: bf Date: 2018-07-18.20:15:38
2 patches for repository http://darcs.net/screened:

patch 1fa8d0184777343dba5c9f4662bd61f289a6c7be
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Jul  2 15:19:23 CEST 2018
  * explain how tentativelyMergePatches works
  
  This patch also renames a few local variables in this function.

patch 56697665b8f9865d943e712cf86c8fdcc899cdd6
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Jul  2 15:19:30 CEST 2018
  * move applyToTentativePristine to before repo changes
  
  This is pure code aesthetics. The call gets the original r (Repository)
  passed, so it looks better if we make it before we call the functions that
  return the new (coerced) Repository.
Attachments
msg20241 (view) Author: ganesh Date: 2018-08-09.05:34:07
> * explain how tentativelyMergePatches works

Looks good, thanks for the documentation.

>  * move applyToTentativePristine to before repo changes

Makes sense, thanks.
History
Date User Action Args
2018-07-18 20:15:38bfcreate
2018-08-09 05:34:07ganeshsetstatus: needs-review -> accepted-pending-tests
messages: + msg20241
2018-08-13 07:00:01ganeshsetstatus: accepted-pending-tests -> accepted