Patch 1915: Add a test for rebasing a pre-existing c... (and 1 more) - Darcs bug tracker

Title	Add a test for rebasing a pre-existing c... (and 1 more)
Superseder		Nosy List	bfrk, ganesh
Related Issues
Status	accepted	Assigned To	bfrk
Milestone

Created on 2019-09-14.15:22:23 by ganesh, last changed 2019-09-23.11:59:07 by bfrk.

Files
File name	Status	Uploaded	Type	Edit	Remove
add-a-test-for-rebasing-a-pre_existing-conflict.dpatch		ganesh, 2019-09-14.15:22:23	application/x-darcs-patch
clarify-meaning-of-_simple_-in-test-name.dpatch		ganesh, 2019-09-22.19:27:35	application/x-darcs-patch
patch-preview.txt		ganesh, 2019-09-14.15:22:23	text/x-darcs-patch
patch-preview.txt		ganesh, 2019-09-22.19:27:35	text/x-darcs-patch
unnamed		ganesh, 2019-09-14.15:22:23	text/plain
unnamed		ganesh, 2019-09-22.19:27:35	text/plain

See mailing list archives for discussion on individual patches.

Messages
msg21411 (view)	Author: ganesh	Date: 2019-09-14.15:22:23
These passing tests demonstrate that at least simple examples of suspending a conflict work. 2 patches for repository darcs-unstable@darcs.net:screened: patch bc6e15cc384c6cd2ae328b517def70abbcee2bd9 Author: Ganesh Sittampalam <ganesh@earth.li> Date: Sat Sep 14 15:19:05 BST 2019 * Add a test for rebasing a pre-existing conflict It ought to work at least in simple scenarios. patch d25e45c06af257c159e9f8566f5f937d528b2990 Author: Ganesh Sittampalam <ganesh@earth.li> Date: Sat Sep 14 16:02:36 BST 2019 * test of upgrading an old-style rebase with a conflict Attachments add-a-test-for-rebasing-a-pre_existing-conflict.dpatch patch-preview.txt unnamed
msg21494 (view)	Author: bfrk	Date: 2019-09-20.15:58:21
> * Add a test for rebasing a pre-existing conflict > > It ought to work at least in simple scenarios. I think the point here is not how complicated the conflict or scenario is. The question is whether we eliminate any patches that the conflicted patch conflicts with, because that invalidates (at least for V3) Conflictors. Otherwise fine.
msg21522 (view)	Author: ganesh	Date: 2019-09-21.22:47:42
> I think the point here is not how complicated the conflict or scenario > is. The question is whether we eliminate any patches that the conflicted > patch conflicts with, because that invalidates (at least for V3) > Conflictors. I guess "simple" is a bit ambiguous and I could have just said "some scenarios". You set this to review-in-progress, but there's not much I can do about the patch comment now. Did you have some followup in mind?
msg21523 (view)	Author: bfrk	Date: 2019-09-22.07:29:20
>> I think the point here is not how complicated the conflict or scenario >> is. The question is whether we eliminate any patches that the conflicted >> patch conflicts with, because that invalidates (at least for V3) >> Conflictors. > > I guess "simple" is a bit ambiguous and I could have just said > "some scenarios". > > You set this to review-in-progress, but there's not much I can do > about the patch comment now. Did you have some followup in mind? I was thinking about that. I guess a small comment in the tests to explain what is meant with 'simple' would be fine, something like "# simple scenario here means we don't remove patches that are part of the conflict".
msg21533 (view)	Author: ganesh	Date: 2019-09-22.19:27:35
1 patch for repository darcs-unstable@darcs.net:screened: patch e9c3420439970174cef39eef96b60249a763311b Author: Ganesh Sittampalam <ganesh@earth.li> Date: Sun Sep 22 20:32:36 BST 2019 * clarify meaning of "simple" in test name Attachments clarify-meaning-of-_simple_-in-test-name.dpatch patch-preview.txt unnamed
msg21544 (view)	Author: bfrk	Date: 2019-09-23.11:59:07
> * clarify meaning of "simple" in test name Thanks!

History
Date	User	Action	Args
2019-09-14 15:22:23	ganesh	create
2019-09-14 18:58:04	ganesh	set	status: needs-screening -> needs-review
2019-09-20 15:58:21	bfrk	set	messages: + msg21494
2019-09-20 17:32:19	bfrk	set	status: needs-review -> review-in-progress
2019-09-21 22:47:42	ganesh	set	messages: + msg21522
2019-09-22 07:29:21	bfrk	set	messages: + msg21523
2019-09-22 08:10:56	bfrk	set	status: review-in-progress -> followup-requested assignedto: ganesh
2019-09-22 19:27:35	ganesh	set	files: + patch-preview.txt, clarify-meaning-of-_simple_-in-test-name.dpatch, unnamed messages: + msg21533
2019-09-22 19:27:51	ganesh	set	status: followup-requested -> review-in-progress assignedto: ganesh -> bfrk nosy: + bfrk
2019-09-23 11:57:56	bfrk	set	status: review-in-progress -> accepted
2019-09-23 11:59:07	bfrk	set	messages: + msg21544