INSTRUCTIONS FOR SENDING PATCHES 1) put your changes in a darcs directory 2) add the files that you need with darcs add .... 3) record your changes with darcs record 4) check that it works with the follwing steps a) go up one directory level, do darcs get paris-devel This will create a new "pure" directory that has no files added w/r to the darcs-recorded files. This way, if you forgot to add some essential files in step 2) you will find out. b) do make clean test 5) send me the changes with the two following steps a) create the patch file patch-yourname-file.txt (or any other name ending in .txt) in the following way: darcs send -o patch-yourname-file.txt http://www.ida.upmc.fr/~zaleski/darcs/paris-devel b) email me the file patch-yourname-file.txt 6) At some point, darcs may tell you that there are "conflicts". Then what you should do is a) go in a darcs directory b) do darcs revert (it may remove some of your changes, so you will have to add them again later. You may want to create backup versions of your changes) c) do darcs pull http://www.ida.upmc.fr/~zaleski/darcs/paris-devel d) put back your changes e) repeat steps 3-5) . Don't wait to long, because if the main repository changes again, you or even I may have conflicts again.