diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2004-11-07 23:19:26 +0000 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2004-11-07 23:19:26 +0000 |
| commit | 5a713434117bae25c223d93166dcc9b840d3c156 (patch) | |
| tree | 55af6b24185ab24a17747cc65b833cad0b6b48da | |
| parent | 60f10ced9e094923e280350aaa8ed6aa5e53d825 (diff) | |
| download | fetchmail-5a713434117bae25c223d93166dcc9b840d3c156.tar.gz fetchmail-5a713434117bae25c223d93166dcc9b840d3c156.tar.bz2 fetchmail-5a713434117bae25c223d93166dcc9b840d3c156.zip | |
Add instructions on updating/merging.
svn path=/trunk/; revision=3977
| -rw-r--r-- | ucs/README.svn | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/ucs/README.svn b/ucs/README.svn new file mode 100644 index 00000000..4b0c67ab --- /dev/null +++ b/ucs/README.svn @@ -0,0 +1,17 @@ +The procedure of the files in this directory is laid out in the +"General Vendor Branch Management Procedure" chapter of the SVN book. + +In detail: + +- check out /vendor/markus-kuhn/ucs/current +- replace the files we have by the newer releases +- if files are removed or added, make this known to svn with svn rm and + svn add +- commit +- then tag (svn copy) as /vendor/markus-kuhn/ucs/YYYY-MM-DD + +- change to the trunk directory +- run svn merge, merging from the previous _tag_ to "current" + (literally) +- resolve conflicts +- commit the merge |