summaryrefslogtreecommitdiff
path: root/wiki
diff options
context:
space:
mode:
authormshields@google.com <mshields@google.com@09200d28-7f98-11dd-ad27-0f66e57d2035>2008-10-27 08:21:02 +0000
committermshields@google.com <mshields@google.com@09200d28-7f98-11dd-ad27-0f66e57d2035>2008-10-27 08:21:02 +0000
commite1ea24f92a2b0f3e6f7e21d1ae4c125986aed2c2 (patch)
tree8edb05ea9bceecfe78ac96db17bf56ade9a88361 /wiki
parentc59e73d1a1185b17cb0d463145a39e3474594603 (diff)
downloadipaddr-py-e1ea24f92a2b0f3e6f7e21d1ae4c125986aed2c2.tar.gz
Edited wiki page through web user interface.
git-svn-id: https://ipaddr-py.googlecode.com/svn@31 09200d28-7f98-11dd-ad27-0f66e57d2035
Diffstat (limited to 'wiki')
-rw-r--r--wiki/Releasing.wiki2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiki/Releasing.wiki b/wiki/Releasing.wiki
index f6f85be..9b22ae4 100644
--- a/wiki/Releasing.wiki
+++ b/wiki/Releasing.wiki
@@ -6,7 +6,7 @@ Choose a release number; see [http://www.producingoss.com/en/development-cycle.h
If preparing for an a.b.0 release, create a [http://www.producingoss.com/en/release-branches.html release branch] called `a.b.x` (literal `x`): `svn copy -m'Creating 1.0.x release branch' https://ipaddr-py.googlecode.com/svn/trunk/ https://ipaddr-py.googlecode.com/svn/branches/1.0.x`
-If preparing for a micro release, first switch your client to the release branch: `svn switch https://ipaddr-py.googlecode.com/svn/branches/1.0.x` (or `svn co` to a new directory). Then [http://svnbook.red-bean.com/en/1.1/ch04s03.html merge] the changes from the trunk you want, and commit them.
+If preparing for a micro release, first switch your client to the release branch: `svn switch https://ipaddr-py.googlecode.com/svn/branches/1.0.x` (or `svn co` to a new directory). Then [http://svnbook.red-bean.com/en/1.1/ch04s03.html merge] the changes you want from the trunk (`svn merge -r6:7 https://ipaddr-py.googlecode.com/svn/trunk`), and commit them.
== Actually making a release ==