[svn:parrot] r37945 - trunk/docs/project
chromatic at svn.parrot.org
chromatic at svn.parrot.org
Tue Apr 7 17:55:47 UTC 2009
Author: chromatic
Date: Tue Apr 7 17:55:46 2009
New Revision: 37945
URL: https://trac.parrot.org/parrot/changeset/37945
Log:
[docs] Updated references to svn.parrot.org from svn.perl.org.
Modified:
trunk/docs/project/branching_guide.pod
Modified: trunk/docs/project/branching_guide.pod
==============================================================================
--- trunk/docs/project/branching_guide.pod Tue Apr 7 15:56:46 2009 (r37944)
+++ trunk/docs/project/branching_guide.pod Tue Apr 7 17:55:46 2009 (r37945)
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, Parrot Foundation.
+# Copyright (C) 2008-2009, Parrot Foundation.
# $Id$
=head1 Branching Instructions
@@ -17,8 +17,8 @@
To create a branch, use the C<svn copy> command.
- $ svn copy https://svn.perl.org/parrot/trunk \
- https://svn.perl.org/parrot/branches/<yourbranchname> \
+ $ svn copy https://svn.parrot.org/parrot/trunk \
+ https://svn.parrot.org/parrot/branches/<yourbranchname> \
-m "Created branch for <purpose of branch>."
Record the revision number of the branch (in a text file or otherwise), you
@@ -29,7 +29,7 @@
Check out your branch for working:
- $ svn co https://svn.perl.org/parrot/branches/<yourbranchname>
+ $ svn co https://svn.parrot.org/parrot/branches/<yourbranchname>
=head2 Maintaining a Branch
@@ -50,7 +50,7 @@
C<HEAD> (a short-cut for the current highest revision), which tells it to grab
all changes committed between those two revision numbers.
- $ svn merge -r30235:HEAD https://svn.perl.org/parrot/trunk/
+ $ svn merge -r30235:HEAD https://svn.parrot.org/parrot/trunk/
Check for conflicts in the merged code:
@@ -120,7 +120,7 @@
C<HEAD> to tell it to grab all changes committed in the branch from the time
you created the branch to the most recent change.
- svn merge -r30235:HEAD https://svn.perl.org/parrot/branches/<yourbranchname>/
+ svn merge -r30235:HEAD https://svn.parrot.org/parrot/branches/<yourbranchname>/
(If you didn't keep the revision number when you created the branch, you can
find it by clever detective work in C<svn log>. It's easier just to keep it in
@@ -134,7 +134,7 @@
Delete your branch from the repository:
- svn delete https://svn.perl.org/parrot/branches/<yourbranchname> \
+ svn delete https://svn.parrot.org/parrot/branches/<yourbranchname> \
-m "Removed <describe branch> from the repository."
=head2 Announcing a Merge
More information about the parrot-commits
mailing list