On Tue, Feb 8, 2011 at 10:51 PM, Richard Hipp <d...@sqlite.org> wrote:
> On Tue, Feb 8, 2011 at 4:26 PM, Nolan Darilek <no...@thewordnerd.info>wrote: > >> -----BEGIN PGP SIGNED MESSAGE----- >> Hash: SHA1 >> >> Actually, this sounds a bit like what I mentioned several months back >> regarding bundles. >> > > Yes. > > After thinking things over, I'm inclined to say just use plan old > diff-patches. > +1 again. That's the conclusion i came to announce when i saw that you had already done so. > So if somebody wants to propose a change, they clone the repository and > start > making changes. Then submit them by doing: > > fossil diff --from VERSION-WHERE-STARTED --to current >patch.txt > > And then append the patch.txt to the ticket. > i like that. And we're not tied to the ticket system - the patches could come from email or whatever. That approach drops the "history" of the patch - the sequence of individual > checkins that the contributor used in developing the patch - and makes the > patch a single big change. I'm not sure that is such a bad thing, though. > When importing data in this manner, i think a single big change would be the most viable option. i think it would be rare to want to roll back just a part of such an import. In problematic cases, the importer could request smaller chunks from the contributor, in the name of source tree sanity. Regarding Justin's comment about patch attribution: in the larger scheme of applying patches, regardless of the underlying SCM, credits to the contributor are normally relegated to the commit message or changelog or similar places. i don't feel that we need to record a _fossil_ user name for the contributor because that implies that the user has an account on the repo the patch is being applied to (which he presumably doesn't have, or he'd be committing the code himself), and that such a name does not conflict with an existing account holder's name (which would lead to incorrect attribution). -- ----- stephan beal http://wanderinghorse.net/home/stephan/
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
