Mercurial > hg-stable
changeset 13410:1f2b2c33d386
tests: fixes for svn 1.4.2
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 15 Feb 2011 16:19:11 -0600 |
| parents | 9e5df8719ad4 |
| children | d4de90a612f7 |
| files | tests/test-mq-subrepo-svn.t tests/test-subrepo-svn.t |
| diffstat | 2 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-mq-subrepo-svn.t Tue Feb 15 20:02:52 2011 +0100 +++ b/tests/test-mq-subrepo-svn.t Tue Feb 15 16:19:11 2011 -0600 @@ -34,7 +34,7 @@ Checked out revision 1. $ echo 'sub = [svn]sub' >> .hgsub $ hg add .hgsub - $ hg status -S + $ hg status -S -X '**/format' A .hgsub ? sub/.svn/entries $ hg qnew -m0 0.diff @@ -44,7 +44,7 @@ $ svn add a A a $ svn st - A a + A* a (glob) $ cd .. $ hg status -S # doesn't show status for svn subrepos (yet) $ hg qnew -m1 1.diff
--- a/tests/test-subrepo-svn.t Tue Feb 15 20:02:52 2011 +0100 +++ b/tests/test-subrepo-svn.t Tue Feb 15 16:19:11 2011 -0600 @@ -126,7 +126,7 @@ add an unrelated revision in svn and update the subrepo to without bringing any changes. - $ svn mkdir --parents "$SVNREPO/unrelated" -m 'create unrelated' + $ svn mkdir "$SVNREPO/unrelated" -m 'create unrelated' Committed revision 4. $ svn up s @@ -273,11 +273,11 @@ $ echo c1 > f2 $ svn add f1 -q $ svn status - ? a - X externals - ? f2 - M alpha - A f1 + ? * a (glob) + X * externals (glob) + ? * f2 (glob) + M * alpha (glob) + A * f1 (glob) Performing status on external item at 'externals' $ cd ../.. @@ -290,9 +290,9 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd t/s $ svn status - ? a - X externals - ? f1 - ? f2 + ? * a (glob) + X * externals (glob) + ? * f1 (glob) + ? * f2 (glob) Performing status on external item at 'externals'