darcs

Patch 1103 resolve issue2343: darcs amend-record does not record ...

Title resolve issue2343: darcs amend-record does not record ...
Superseder Nosy List jlneder
Related Issues darcs amend-record does not record my change
View: 2343
Status accepted Assigned To
Milestone

Created on 2013-09-17.21:06:17 by jlneder, last changed 2013-10-10.15:07:30 by gh.

Files
File name Status Uploaded Type Edit Remove
add-better-comments-to-the-issue2343-test-file.dpatch jlneder, 2013-09-22.22:57:34 application/x-darcs-patch
patch-preview.txt jlneder, 2013-09-17.21:06:17 text/x-darcs-patch
patch-preview.txt jlneder, 2013-09-22.22:36:07 text/x-darcs-patch
patch-preview.txt jlneder, 2013-09-22.22:57:34 text/x-darcs-patch
resolve-issue2343_-darcs-amend_record-does-not-record-my-change.dpatch jlneder, 2013-09-17.21:06:17 application/x-darcs-patch
resolve-issue2343_-darcs-amend_record-does-not-record-my-change.dpatch jlneder, 2013-09-22.22:36:07 application/x-darcs-patch
unnamed jlneder, 2013-09-17.21:06:17
unnamed jlneder, 2013-09-22.22:36:07
unnamed jlneder, 2013-09-22.22:57:34
See mailing list archives for discussion on individual patches.
Messages
msg17037 (view) Author: jlneder Date: 2013-09-17.21:06:17
This patch fixes the issue from the files darcs-issue2343.tar.gz and
test-repo.tgz. I don't know if the amend issue is the same problem.
1 patch for repository http://darcs.net/screened:

Tue Sep 17 18:01:01 ART 2013  Jose Luis Neder <jlneder@gmail.com>
  * resolve issue2343: darcs amend-record does not record my change
Attachments
msg17041 (view) Author: gh Date: 2013-09-22.20:39:30
I'm screening it since it fixes patience diff on the cases shown in
issue2343 and the shell test you provided. But the change and the shell
tests need more explanations, I'd like at least an explanation here and
ideally comments on the piece of code modified. Also the comments in the
shell test refer to some "conflict" which I think is not the term you
want to use.
msg17043 (view) Author: jlneder Date: 2013-09-22.22:36:07
I added an explanation on the test case. It was a mistake i made when it's
checking the last common lines from bottom to top, for "boring lines". It was
checking a line above the last common line (the index was n instead of (n+1))
and therefore it was doing a wrong diff when this last line that was different
was a boring line in one and not in the other.
1 patch for repository http://darcs.net/screened:

Sun Sep 22 19:24:42 ART 2013  Jose Luis Neder <jlneder@gmail.com>
  * resolve issue2343: darcs amend-record does not record my change
Attachments
msg17044 (view) Author: jlneder Date: 2013-09-22.22:57:34
Here are the comments for the test file in a new patch.
1 patch for repository http://darcs.net/screened:

Sun Sep 22 19:43:03 ART 2013  Jose Luis Neder <jlneder@gmail.com>
  * Add better comments to the issue2343 test file
  It adds some comment explaining the issue, when it happens and why.
Attachments
msg17055 (view) Author: gh Date: 2013-10-10.15:07:30
Accepted.
History
Date User Action Args
2013-09-17 21:06:17jlnedercreate
2013-09-17 21:33:29jlnedersetissues: + darcs amend-record does not record my change
2013-09-22 20:39:30ghsetstatus: needs-screening -> needs-review
messages: + msg17041
2013-09-22 22:36:07jlnedersetfiles: + patch-preview.txt, resolve-issue2343_-darcs-amend_record-does-not-record-my-change.dpatch, unnamed
messages: + msg17043
2013-09-22 22:57:34jlnedersetfiles: + patch-preview.txt, add-better-comments-to-the-issue2343-test-file.dpatch, unnamed
messages: + msg17044
2013-10-10 15:07:30ghsetstatus: needs-review -> accepted
messages: + msg17055