diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-08-28 14:21:26 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-08-28 14:21:26 +0100 |
| commit | 25487adfaf92f2f708a846c9af69905cba36c3fe (patch) | |
| tree | 8b594ab64c2fb1f3726c1f2eb7be1c4d09a87d39 | |
| parent | e65eaaf0a297390d162b6c6edd1588bda4745971 (diff) | |
| parent | 4e3e8a29f19fa4f6b0beb1b636978bd5745313c1 (diff) | |
| download | lorry-25487adfaf92f2f708a846c9af69905cba36c3fe.tar.gz | |
Merge branch 'master' into liw/morph
Conflicts:
lorries/libapr.lorry
| -rw-r--r-- | lorries/libapr-util.lorry | 7 | ||||
| -rw-r--r-- | lorries/libapr.lorry | 9 | ||||
| -rw-r--r-- | lorries/mutter.lorry | 6 | ||||
| -rwxr-xr-x | tests/cvs-single-commit.script | 13 | ||||
| -rw-r--r-- | tests/cvs-single-commit.stdout | 3 |
5 files changed, 30 insertions, 8 deletions
diff --git a/lorries/libapr-util.lorry b/lorries/libapr-util.lorry new file mode 100644 index 0000000..536c579 --- /dev/null +++ b/lorries/libapr-util.lorry @@ -0,0 +1,7 @@ +{ + "libapr-util": { + "type": "svn", + "url": "http://svn.apache.org/repos/asf/apr/apr-util/", + "layout": "standard" + } +} diff --git a/lorries/libapr.lorry b/lorries/libapr.lorry index 0c5af5a..ee520b5 100644 --- a/lorries/libapr.lorry +++ b/lorries/libapr.lorry @@ -1,6 +1,7 @@ { - "name": "libapr", - "type": "svn", - "url": "http://svn.apache.org/repos/asf/apr/apr/", - "layout": "standard" + "libapr": { + "type": "svn", + "url": "http://svn.apache.org/repos/asf/apr/apr/", + "layout": "standard" + } } diff --git a/lorries/mutter.lorry b/lorries/mutter.lorry new file mode 100644 index 0000000..b86cd0b --- /dev/null +++ b/lorries/mutter.lorry @@ -0,0 +1,6 @@ +{ + "mutter": { + "type": "git", + "url": "git://git.gnome.org/mutter" + } +} diff --git a/tests/cvs-single-commit.script b/tests/cvs-single-commit.script index 6f1736c..ad4eca8 100755 --- a/tests/cvs-single-commit.script +++ b/tests/cvs-single-commit.script @@ -23,6 +23,11 @@ set -e logfile="$DATADIR/cvs-test-repo.log" workdir="$DATADIR/work-dir" +# CVS wants $USER, $LOGNAME, and $LOGNAME set to a real username. +export USER=root +export LOGNAME=$USER +export USERNAME=$USER + ./lorry --pull-only --log="$logfile" --working-area="$workdir" \ "$DATADIR/cvs-test-repo.lorry" > /dev/null 2> /dev/null @@ -30,12 +35,12 @@ workdir="$DATADIR/work-dir" ( cd "$workdir/cvs-test-repo/git/" - # list the branches - git show-ref | cut -d' ' -f2 + echo "branches:" + git show-ref | cut -d' ' -f2 | LC_ALL=C sort - # cat the test file + echo "test file:" git cat-file blob master:test.txt - # list the commit messages + echo "commit messages:" git log --pretty='%s' master ) diff --git a/tests/cvs-single-commit.stdout b/tests/cvs-single-commit.stdout index 0217108..91f58b0 100644 --- a/tests/cvs-single-commit.stdout +++ b/tests/cvs-single-commit.stdout @@ -1,5 +1,8 @@ +branches: refs/heads/master refs/heads/origin +test file: first line +commit messages: first commit initial checkin |