Ignore:
Timestamp:
Jan 12, 2010, 11:55:27 PM (13 years ago)
Author:
ezyang
Message:
Merged in changes from trunk

--- Merging r1262 through r1413 into 'deploy/bin':
U    deploy/bin/django
   C deploy/bin/rails
   > Resolved by accepting working copy
--- Merging r1221 through r1413 into '.':
U    sql/bin/get-password
U    sql/bin/save-password
U    doc/tickets/rt.txt
U    doc/tickets/cnames.txt
U    bin/fix-php-ini
   C bin/scripts-rails
   > Resolved by accepting working copy
Skipped 'bin/for-each-server'
 U   bin
U    sbin/parallel-find.pl
U    sbin/commit-email.pl
U    sbin/commit-zephyr
Summary of conflicts:
  Tree conflicts: 2
  Skipped paths: 1

Location:
branches/locker-dev/locker
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/locker-dev/locker

  • branches/locker-dev/locker/sbin/commit-zephyr

    r748 r1414  
    1 #!/bin/sh
     1#!/bin/bash
     2#
     3# This is a script that can be called from a Subversion post-commit hook
     4# to zephyr a summary of the commit or the full commit.
     5#
     6# Use by putting something like the following in hooks/post-commit:
     7# REPOS="$1"
     8# REV="$2"
     9# /mit/snippets/svn-hooks/commit-zephyr "$REPOS" "$REV" -c scripts
     10# /mit/snippets/svn-hooks/commit-zephyr "$REPOS" "$REV" --full -c scripts-auto -i commits
    211
    3 CLASS=scripts
     12export LC_ALL=en_US.UTF-8
     13
     14CLASS=test
    415INSTANCE=@
    516FULL=0
     
    3950        echo svnlook diff "$REPOS" -r "$REV"
    4051    fi
    41 ) | zwrite -d -c "$CLASS" -i "$INSTANCE" -s "r$REV - $dirs"
     52) | zwrite -d -c "$CLASS" -i "$INSTANCE" -O "auto" -s "SVN: r$REV"
Note: See TracChangeset for help on using the changeset viewer.