diff options
author | Karl Berry <karl@freefriends.org> | 2009-02-28 00:53:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-02-28 00:53:45 +0000 |
commit | 12578d1a52ce03405f82bdd9bfdb86df9ea8c041 (patch) | |
tree | d541f984be0d8c3cd0b17d0f1334107f229386c8 | |
parent | 9c834471489aa271e30e0d0af2ac8ae81fd7753b (diff) |
doc fixes
git-svn-id: svn://tug.org/texlive/trunk@12261 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Master/tlpkg/bin/tlprm | 2 | ||||
-rw-r--r-- | Master/tlpkg/doc/packages.txt | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Master/tlpkg/bin/tlprm b/Master/tlpkg/bin/tlprm index cfa18ba3ca4..d137cdaacd3 100755 --- a/Master/tlpkg/bin/tlprm +++ b/Master/tlpkg/bin/tlprm @@ -73,7 +73,7 @@ sub main `printf "$removals" >$commit_file`; print "if license in Catalogue is still free, " - . 'tell Robin.Fairbairns@cl.cam.ac.uk.\n'; + . "tell Robin.Fairbairns@cl.cam.ac.uk.\n"; my $tsrc = "$Master/tlpkg/tlpsrc"; my @lines = `grep -l 'depend.* $f\$' $tsrc/collection-* $tsrc/scheme-*`; diff --git a/Master/tlpkg/doc/packages.txt b/Master/tlpkg/doc/packages.txt index 22987b31878..3288b07383e 100644 --- a/Master/tlpkg/doc/packages.txt +++ b/Master/tlpkg/doc/packages.txt @@ -21,7 +21,7 @@ consider mv-ing the old directory so as not to actually make new containers. Coordinate with CTAN. -To make the tag + branch of (or to prepare for) a new release: +To make the tag + branch of a release after it is complete: svn copy -r 10402 -m'texlive-2008.0 tag based on r10402' svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-2008.0 svn copy -r 10402 -m'branch2008 branch based on r10402' svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/branch2008 @@ -30,3 +30,11 @@ http://svnbook.red-bean.com/en/1.5/svn-book.html#svn.branchmerge Do both a branch and a tag so that it's possible to easily compare the current state of the branch with its starting point (the tag). + +Different naming convention to branch before a release, for development +work before we want to switch trunk over: +svn copy -r 12205 -m'texlive-2009-dev tag based on r12205' svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-2009-dev +svn copy -r 12205 -m'branch2009-dev branch based on r12205' svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/branch2009-dev + +Use -dev instead of .something because - will sort first, keeping the +listings in a nice chronological order. |