darcs

Patch 1763 resolve issue2603: warn and mark conflicts when cloning

Title resolve issue2603: warn and mark conflicts when cloning
Superseder Nosy List bf
Related Issues
Status accepted Assigned To
Milestone

Created on 2018-11-14.21:04:06 by bf, last changed 2018-11-18.08:03:43 by ganesh.

Files
File name Status Uploaded Type Edit Remove
accept-issue2603_-clone-repo-with-unresolved-conflicts.dpatch bf, 2018-11-14.21:04:06 application/x-darcs-patch
fix-test-for-issue1923-after-fix-for-issue2603-broke-it.dpatch bf, 2018-11-15.16:52:03 application/x-darcs-patch
patch-preview.txt bf, 2018-11-14.21:04:06 text/x-darcs-patch
patch-preview.txt bf, 2018-11-15.16:52:03 text/x-darcs-patch
unnamed bf, 2018-11-14.21:04:06 text/plain
unnamed bf, 2018-11-15.16:52:03 text/plain
See mailing list archives for discussion on individual patches.
Messages
msg20459 (view) Author: bf Date: 2018-11-14.21:04:06
2 patches for repository http://darcs.net/screened:

patch 84a7e87ab4926d3ce5591d15ae28beab06aaf79c
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Nov 14 21:32:28 CET 2018
  * accept issue2603: clone repo with unresolved conflicts

patch 67418ecc6fa5c29a46818f918624c7ad2b3bcf83
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Nov 14 22:00:30 CET 2018
  * resolve issue2603: warn and mark conflicts when cloning
Attachments
msg20463 (view) Author: bf Date: 2018-11-15.16:52:03
An additional bundle to fix the test for issue1923.

Note: the fix for issue2603 means that clone --lazy is no longer lazy on
patches after the latest clean tag. I think there is no way to avoid that.

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

patch 94ac9a2ad4d8ce4f510d4f34feb98aa00dc9f6bb
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Nov 15 17:34:44 CET 2018
  * fix test for issue1923 after fix for issue2603 broke it
  
  The fix for issue2603 adds a call to patchsetConflictResolutions on the
  newly cloned repo. This procedure must look at the content of every patch in
  the head inventory i.e. all patches after the latest clean tag. This
  effectively forces these patches, so they are no longer lazy. So the bogus
  sources that the test fakes for the new repo aren't even looked at. The fix
  is simple: just record a tag after the single patch.
Attachments
msg20498 (view) Author: ganesh Date: 2018-11-17.23:54:35
Fine
History
Date User Action Args
2018-11-14 21:04:06bfcreate
2018-11-14 21:30:24bfsettitle: accept issue2603: clone repo with unreso... (and 1 more) -> resolve issue2603: warn and mark conflicts when cloning
2018-11-15 16:52:04bfsetfiles: + patch-preview.txt, fix-test-for-issue1923-after-fix-for-issue2603-broke-it.dpatch, unnamed
messages: + msg20463
2018-11-15 19:23:38bfsetstatus: needs-screening -> needs-review
2018-11-17 23:54:35ganeshsetstatus: needs-review -> accepted-pending-tests
messages: + msg20498
2018-11-18 08:03:43ganeshsetstatus: accepted-pending-tests -> accepted