Mercurial > hg
changeset 7536:825631b6d256
merge with crew-stable (again)
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Fri, 19 Dec 2008 08:42:41 +0100 |
| parents | 9a962209dc28 (current diff) 7fc19b12cb6b (diff) |
| children | 9e186bda013d |
| files | |
| diffstat | 2 files changed, 39 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-mq-qclone-http Fri Dec 19 08:20:19 2008 +0100 +++ b/tests/test-mq-qclone-http Fri Dec 19 08:42:41 2008 +0100 @@ -23,8 +23,8 @@ cd .. cat > collections.conf <<EOF -[collections] -$root=$root +[paths] +/=$root/** EOF hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \ @@ -37,3 +37,19 @@ hg --cwd b log --template "{desc}\n" hg --cwd b qpush -a hg --cwd b log --template "{desc}\n" + +cat > collections1.conf <<EOF +[paths] +/=$root/* +EOF + +hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf collections1.conf \ + -A access-paths.log -E error-paths-1.log +cat hg.pid >> $DAEMON_PIDS + +"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw' + +hg qclone http://localhost:$HGPORT1/a c +hg --cwd c log --template "{desc}\n" +hg --cwd c qpush -a +hg --cwd c log --template "{desc}\n"
--- a/tests/test-mq-qclone-http.out Fri Dec 19 08:20:19 2008 +0100 +++ b/tests/test-mq-qclone-http.out Fri Dec 19 08:42:41 2008 +0100 @@ -27,3 +27,24 @@ Now at: b.patch imported patch b.patch a +200 Script output follows + + +/a/ + +requesting all changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files +requesting all changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files +updating working directory +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +a +no patches in series +a