darcs

Patch 1010 move filterOutConflicts from UI.SelectChanges to Repos...

Title move filterOutConflicts from UI.SelectChanges to Repos...
Superseder Nosy List gh
Related Issues
Status accepted Assigned To
Milestone

Created on 2013-01-13.18:22:05 by gh, last changed 2013-02-14.17:25:13 by gh.

Files
File name Status Uploaded Type Edit Remove
fix-copy_and_paste-error-in-filteroutconflicts-refactoring.dpatch ganesh, 2013-01-20.21:52:34 application/x-darcs-patch
move-filteroutconflicts-from-ui_selectchanges-to-repository_state.dpatch gh, 2013-01-13.18:22:05 application/x-darcs-patch
patch-preview.txt gh, 2013-01-13.18:22:05 text/x-darcs-patch
patch-preview.txt ganesh, 2013-01-20.21:52:34 text/x-darcs-patch
unnamed gh, 2013-01-13.18:22:05
unnamed ganesh, 2013-01-20.21:52:34
See mailing list archives for discussion on individual patches.
Messages
msg16532 (view) Author: gh Date: 2013-01-13.18:22:05
I'm not sure Darcs.Repository.State is the best place for
filterOutConflitcs, but this is certainly better than UI.

Darcsden uses this function to pull patches between forked repositories.

1 patch for repository http://darcs.net:

Sat Jan 12 18:45:55 ART 2013  Guillaume Hoffmann <guillaumh@gmail.com>
  * move filterOutConflicts from UI.SelectChanges to Repository.State
Attachments
msg16540 (view) Author: ganesh Date: 2013-01-19.01:11:24
This appears to break the pull_compl test (I'm giving darcs test --backoff 
a workout here to track down failures in my local repo; I haven't checked 
carefully!)
msg16544 (view) Author: ganesh Date: 2013-01-20.21:52:34
Found the problem:

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

Sun Jan 20 21:50:10 GMT 2013  Ganesh Sittampalam <ganesh@earth.li>
  * fix copy-and-paste error in filterOutConflicts refactoring
Attachments
msg16580 (view) Author: gh Date: 2013-02-14.17:25:13
Thanks Ganesh, I'm pushing the bundle.
History
Date User Action Args
2013-01-13 18:22:05ghcreate
2013-01-13 22:11:44ganeshsetstatus: needs-screening -> needs-review
2013-01-19 01:11:24ganeshsetmessages: + msg16540
2013-01-20 21:52:34ganeshsetfiles: + patch-preview.txt, fix-copy_and_paste-error-in-filteroutconflicts-refactoring.dpatch, unnamed
messages: + msg16544
2013-02-14 17:25:13ghsetstatus: needs-review -> accepted
messages: + msg16580