On 15 Apr 2008, at 19:10, Jason Dagit wrote: > 1) Darcs knows when one patch depends on another at the patch > level. So if 2 is required to apply 3, then when cherry picking 3 > you'll also get 2.
Hi Jason That's true. I wasn't worried about the change of missing dependent changes when cherry picking 3, if anything it was cherry picking 2 and not getting 3. Collapsing the patches would avoid that, and (this was my real reason for asking) make the changes list easier to read. I was just being neurotic about the aesthetics of my rep history :) (I am so used to creating SVN histories with millions of "oh, and I forgot this too..." patches, I've been spoilt by the idea of modifying a local record.) > 2) If you have two patches that don't depend on each other at the > patch level, but are related, then you can use --ask-deps to > explicitly make 3 depend on 2. Check the manual for more details: > http://darcs.net/manual/node7.html#SECTION00761000000000000000 > Ok cool, that would solve the first issue above (the dependency), but not clean up the repo history, of course. > I'm not aware of a way to coalesce or collapse the patches, but > knowing the above and using amend-record/--ask-deps should get you > what you want. I guess if I had this history in R1: 4 unrecorded changes \ / 3 | 2 | 1 and I wanted to merge 2 and 3, I could unrecord 4 and 3, amend-record the changes for 3 into 2, then re-record 4. That's a lot of work to go to for the sake of a change entry though... Thanks for the tips Ashley -- http://www.patchspace.co.uk/ http://aviewfromafar.net/ _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
