diff options
| author | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-07 13:37:26 +0000 |
|---|---|---|
| committer | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-07 13:37:26 +0000 |
| commit | 20d7c27cf0f38fb323830ee310214b5ef9ede4f4 (patch) | |
| tree | 9d50ca02cd409c64e4295bbe4880ada3f5fc3cf9 /maintainer-scripts | |
| parent | 6d2b8fda842e85e431f083972755020750e06e34 (diff) | |
Mainline merge as of 2003-05-04.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@66559 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'maintainer-scripts')
| -rw-r--r-- | maintainer-scripts/ChangeLog | 10 | ||||
| -rwxr-xr-x | maintainer-scripts/update_version | 9 |
2 files changed, 16 insertions, 3 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index 943aa611863..991095c8027 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,3 +1,13 @@ +2003-05-02 Gerald Pfeifer <gerald@pfeifer@dbai.tuwien.ac.at> + + * update_version (IGNORE_BRANCHES): Add. + (BRANCHES): Do not consider branches matching $IGNORE_BRANCHES. + +2003-05-02 Gerald Pfeifer <gerald@pfeifer@dbai.tuwien.ac.at> + + * update_version: Add a trace of which branch we are currently + working on. + 2002-12-16 Mark Mitchell <mark@codesourcery.com> * gcc_release: Make snapshots from the GCC 3.3 branch. diff --git a/maintainer-scripts/update_version b/maintainer-scripts/update_version index ff29928be2e..bde683eb8ec 100755 --- a/maintainer-scripts/update_version +++ b/maintainer-scripts/update_version @@ -1,7 +1,9 @@ #!/bin/sh -# Run this from /tmp. CVSROOT=${CVSROOT:-/cvs/gcc} +IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2)-branch' + +# Run this from /tmp. export CVSROOT /bin/rm -rf /tmp/$$ /bin/mkdir /tmp/$$ @@ -14,7 +16,8 @@ CVS=${CVS:-/usr/local/bin/cvs} $CVS co gcc/ChangeLog BRANCHES=`$CVS status -v gcc/ChangeLog \ | awk '{print $1;}' \ - | egrep 'gcc-[0-9]+_[0-9]+-branch$'` + | egrep 'gcc-[0-9]+_[0-9]+-branch$' \ + | egrep -v $IGNORE_BRANCHES` # Always update the mainline. BRANCHES="${BRANCHES} HEAD" @@ -31,6 +34,7 @@ cppdefine_FILES="gcc/libstdc++-v3/include/bits/c++config" RESULT=0 for BRANCH in $BRANCHES; do + echo "Working on \"$BRANCH\"." # Check out the files on the branch. HEAD is a special case; if # you check out files with -r HEAD, CVS will not let you check # in changes. @@ -83,4 +87,3 @@ done /bin/rm -rf /tmp/$$ exit $RESULT - |