darcs

Issue 2072 move patches aren't properly coalesced

Title move patches aren't properly coalesced
Priority bug Status has-patch
Milestone Resolved in
Superseder Nosy List ganesh
Assigned To
Topics

Created on 2011-05-04.18:10:35 by ganesh, last changed 2023-03-27.15:07:29 by bfrk.

Files
File name Uploaded Type Edit Remove
coalescing.dpatch ganesh, 2012-05-15.17:48:49 application/octet-stream
Messages
msg13985 (view) Author: ganesh Date: 2011-05-04.18:10:34
The following sequence of commands results in a patch that moves the 
files then removes them. I remain rather suspicious of the coalescing 
code in general, but I do have a fix for this specific test case which 
I'll submit shortly.

touch x y
darcs rec -lam "adds"

darcs mv x x2
darcs mv y y2
darcs rec -am "patch"

rm x2 y2
echo 'y' | darcs amend-rec -a
msg13986 (view) Author: ganesh Date: 2011-05-04.22:12:53
Actually, I'm not 100% confident my fix doesn't introduce an infinite 
loop, so I'll do more playing locally before submitting it.
msg15692 (view) Author: ganesh Date: 2012-05-15.17:48:49
Haven't got round to doing something useful with the candidate fix, but 
here it is for future reference.
Attachments
msg22975 (view) Author: bfrk Date: 2022-04-12.15:59:06
My coalesce patches (see patch1885) are fixing this but I haven't yet 
come around to removing the objectionable parts of that bundle.
msg23200 (view) Author: bfrk Date: 2023-03-27.15:07:28
patch1885 has been updated some time ago...
History
Date User Action Args
2011-05-04 18:10:35ganeshcreate
2011-05-04 22:12:54ganeshsetmessages: + msg13986
2012-05-15 17:48:50ganeshsetfiles: + coalescing.dpatch
messages: + msg15692
2022-04-12 15:59:06bfrksetmessages: + msg22975
2022-04-12 16:11:34bfrksetassignedto: ganesh ->
2023-03-27 15:07:29bfrksetmessages: + msg23200