From 5a713434117bae25c223d93166dcc9b840d3c156 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Sun, 7 Nov 2004 23:19:26 +0000
Subject: Add instructions on updating/merging.

svn path=/trunk/; revision=3977
---
 ucs/README.svn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 ucs/README.svn

(limited to 'ucs')

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
-- 
cgit v1.2.3