More thoughts: > fossil merge --bundle BUNDLE ?--cherrypick|--backout CHECK-IN?
* BUNDLE could be a disk file, or something like "bundle:ID" to refer to a bundle submitted via "push request", and queued in a separate repository db table. * If the current check-out is different from the root of the branch contained in the bundle, `fossil merge --bundle' could issue a warning (even if there's no merge conflicts). * The established work-flows for code review and testing could be applied, before committing the merged-in bundle, and `fossil revert' could avoid potential havoc before anything goes to the repository store. > ... it's possible to introduce unwanted contents (and random > control artifacts) ... For example, it's possible to foist control artifacts to modify the comments of random commits already in the repository, or to rename or hide the "trunk". This may not be too easy to detect, if the modified check-ins are out of sight with usual timeline view limits, and control artifacts can also have their time stamps forged by "--date-override", or they can even be hand-crafted and picked up by `fossil reconstruct', and show up far away from their referenced check-ins. Or, if bundles would only allow control artifacts referencing check-ins from that same bundle, multiple serial changes to comments could mask unwanted contents to be sneaked into the repository. This case would be easier to shun, but detailed review of the (possibly complex) meta-data of any bundles is essential. (With the current implementation of bundles, it's also possible to import check-in manifests referencing user names not present in the target repository.) It seems to me that accepting complete bundles from untrusted sources goes near granting them commit access. In order to be merging of "push requests" a task of code review and testing, instead of tedious meta-data checks, I think there should be a way to get "just the code". --Florian _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
