summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-02-05 15:11:50 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-02-05 15:11:50 +0000
commit886ab23a9dfca81951ebe12ff1ccaabf05f61d8d (patch)
tree562b6ffc455cbd613d9ea9163271b69ee0a5addd
parent2cef4b0f8d3411c7985805cda8c5dfc684d75e34 (diff)
downloadqpid-python-886ab23a9dfca81951ebe12ff1ccaabf05f61d8d.tar.gz
Initialized merge tracking via "svnmerge" with revisions "1-501412" from
https://svn.apache.org/repos/asf/incubator/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/perftesting_persistent@503717 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--README.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000000..25a79663f2
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,6 @@
+Updating code base
+------------------
+
+This code is currently maintained using svnmerge.
+
+Changes from the trunk should only be merged using svnmerge as this allows better change tracking. \ No newline at end of file