diff --git a/Patches.md b/Patches.md index 2f5be44..d699c23 100644 --- a/Patches.md +++ b/Patches.md @@ -1,25 +1,11 @@ -UPDATE, now that we have automatic mail from trac to tahoe-dev, maybe it would be better to attach patches to trac. +Please create a new ticket to track the issue unless your patch is a patch for an issue that is already ticketed. -On the [/cgi-bin/mailman/listinfo/tahoe-dev tahoe-dev mailing list], Zooko suggests: - -> I really like using the mailing list for patches, because the mailing -> list is a public, on-the-record conversation that includes everyone. - -> What about this: +Then run the following darcs command to generate a darcs patch file: ``` darcs send -o patch.darcspatch - bzip2 patch.darcspatch - darcs diff -u -p"${PATCHRE}" > patch.diff.txt ``` -> and then send both to the mailing list as attachments. This is more -> work for the submitter, as they have to attach the files to a message -> and send the message (instead of allowing "darcs send" to send the -> message for them). +And attach it to the ticket. -> The bzip2 is necessary to prevent various mail software from mangling the patch so it can't be applied. - -> The good things about this are: - * hopefully everyone can see the patch contents in-line in the mail, and - * you can add a "cover letter" -- a message to the mailing list about the patch. \ No newline at end of file +If you don't have darcs or don't want to use it, just attach a normal old diff. \ No newline at end of file