darcs

Patch 1285 resolve issue2410: detect replaces even with tokens of...

Title resolve issue2410: detect replaces even with tokens of...
Superseder Nosy List ben.franksen, gh, jlneder
Related Issues
Status accepted Assigned To
Milestone 2.10.0

Created on 2015-02-17.22:34:20 by gh, last changed 2015-02-19.02:37:48 by bfrk.

Files
File name Status Uploaded Type Edit Remove
patch-preview.txt gh, 2015-02-17.22:34:19 text/x-darcs-patch
resolve-issue2410_-detect-replaces-even-with-tokens-of-different-lengths.dpatch gh, 2015-02-17.22:34:19 application/x-darcs-patch
unnamed gh, 2015-02-17.22:34:19
See mailing list archives for discussion on individual patches.
Messages
msg18142 (view) Author: gh Date: 2015-02-17.22:34:19
This is what happens when one tests only with 'foo' and 'bar' :-)

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

patch f11edf56b2f9a3f407646253d06a78e966a37f31
Author: Guillaume Hoffmann <guillaumh@gmail.com>
Date:   Tue Feb 17 19:32:48 ART 2015
  * resolve issue2410: detect replaces even with tokens of different lengths
Attachments
msg18159 (view) Author: bfrk Date: 2015-02-19.01:02:23
Interesting, you removed an explicit condition for the tokens to have
the same length. What might have been the idea of that?

Anyway, good move, accepted. And thanks for adding a few extra comments ;-)
msg18163 (view) Author: bfrk Date: 2015-02-19.01:53:30
The fromMaybe bug (see my comment to issue2410) is from
Darcs.Repository.Util.getForceReplace. Looks like the bug was only
uncovered by this patch, not caused by it.

Despite the ugly path conversion code in getReplaces (fromJust $
simpleSubPath $ fn2fp $ normPath f) the path that is passed to findFile
is correct. That means either findFile is broken or the passed tree is
not what we expect.
msg18165 (view) Author: bfrk Date: 2015-02-19.02:37:47
Patch 1286 fixes the fromJust crash
History
Date User Action Args
2015-02-17 22:34:20ghcreate
2015-02-17 22:35:12ghsetstatus: needs-screening -> needs-review
2015-02-17 22:35:37ghsetnosy: + ben.franksen, jlneder
milestone: 2.10.0
2015-02-19 01:02:23bfrksetstatus: needs-review -> accepted
messages: + msg18159
2015-02-19 01:53:31bfrksetmessages: + msg18163
2015-02-19 02:37:48bfrksetmessages: + msg18165