hg-stable: comparison tests/test-subrepo-svn.t

equal deleted inserted replaced

-:b8d8599410da
+:fab28a577a38
 Adding         externals/other
 Adding         src
 Adding         src/alpha
 Transmitting file data ..
 Committed revision 1.
-$ svn up
+$ svn up -q
-At revision 1.
 $ echo "externals -r1 $SVNREPO/externals" > extdef
 $ svn propset -F extdef svn:externals src
 property 'svn:externals' set on 'src'
 $ svn ci -m 'Setting externals'
 Sending        src
 parent: 1:* tip (glob)
 1
 branch: default
 commit: 1 modified, 1 subrepos
 update: (current)
-$ hg commit --subrepos -m 'Message!'
+$ hg commit --subrepos -m 'Message!' | grep -v Updating
 committing subrepository s
 Sending*s/alpha (glob)
 Transmitting file data .
 Committed revision 3.
-Fetching external item into '$TESTTMP/sub/t/s/externals'
+Fetching external item into '*s/externals'* (glob)
 External at revision 1.
 At revision 3.
 $ hg debugsub
 path s
 bringing any changes.
 $ svn mkdir "$SVNREPO/unrelated" -m 'create unrelated'
 Committed revision 4.
-$ svn up s
+$ svn up -q s
-Fetching external item into 's/externals'
-External at revision 1.
-At revision 4.
 $ hg sum
 parent: 2:* tip (glob)
 Message!
 branch: default
 commit: (clean)
 $ hg st
 add a commit from svn
 $ cd "$WCROOT"/src
-$ svn up
+$ svn up -q
-U    alpha
-Fetching external item into 'externals'
-A    externals/other
-Updated external to revision 1.
-Updated to revision 4.
 $ echo xyz >> alpha
 $ svn propset svn:mime-type 'text/xml' alpha
 property 'svn:mime-type' set on 'alpha'
 $ svn ci -m 'amend a from svn'
-Sending        src/alpha
+Sending        *alpha (glob)
 Transmitting file data .
 Committed revision 5.
 $ cd ../../sub/t
 this commit from hg will fail
 $ echo zzz >> s/alpha
-$ hg ci --subrepos -m 'amend alpha from hg'
+$ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date'
 committing subrepository s
-abort: svn: Commit failed (details follow):
+abort: svn:*Commit failed (details follow): (glob)
-svn: (Out of date)?.*/src/alpha.*(is out of date)? (re)
 [255]
 $ svn revert -q s/alpha
 this commit fails because of meta changes
 $ svn propset svn:mime-type 'text/html' s/alpha
 property 'svn:mime-type' set on 's/alpha'
-$ hg ci --subrepos -m 'amend alpha from hg'
+$ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date'
 committing subrepository s
-abort: svn: Commit failed (details follow):
+abort: svn:*Commit failed (details follow): (glob)
-svn: (Out of date)?.*/src/alpha.*(is out of date)? (re)
 [255]
 $ svn revert -q s/alpha
 this commit fails because of externals changes
 $ hg clone t tc | fix_path
 updating to branch default
 A    tc/s/alpha
 U   tc/s
-Fetching external item into 'tc/s/externals'
+Fetching external item into 'tc/s/externals'* (glob)
 A    tc/s/externals/other
 Checked out external at revision 1.
 Checked out revision 3.
 A    tc/subdir/s/alpha
 U   tc/subdir/s
-Fetching external item into 'tc/subdir/s/externals'
+Fetching external item into 'tc/subdir/s/externals'* (glob)
 A    tc/subdir/s/externals/other
 Checked out external at revision 1.
 Checked out revision 2.
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ cd s
 $ echo c0 > alpha
 $ echo c1 > f1
 $ echo c1 > f2
 $ svn add f1 -q
-$ svn status
+$ svn status | sort
 ? *    a (glob)
+? *    f2 (glob)
+A *    f1 (glob)
+M *    alpha (glob)
+Performing status on external item at 'externals'* (glob)
 X *    externals (glob)
-? *    f2 (glob)
-M *    alpha (glob)
-A *    f1 (glob)
-Performing status on external item at 'externals'
 $ cd ../..
 $ hg -R t update -C
-Fetching external item into 't/s/externals'
+Fetching external item into 't/s/externals'* (glob)
 Checked out external at revision 1.
 Checked out revision 3.
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ cd t/s
 ? *    a (glob)
 X *    externals (glob)
 ? *    f1 (glob)
 ? *    f2 (glob)
-Performing status on external item at 'externals'
+Performing status on external item at 'externals'* (glob)
 Sticky subrepositories, no changes
 $ cd $TESTTMP/sub/t
 $ hg id -n
 2
 $ cd s
 $ svnversion
 3
 $ cd ..
 $ hg update 1
-U    $TESTTMP/sub/t/s/alpha
+U    *s/alpha (glob)
-Fetching external item into '$TESTTMP/sub/t/s/externals'
+Fetching external item into '*s/externals'* (glob)
 Checked out external at revision 1.
 Checked out revision 2.
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg id -n
 $ cd s
 $ svnversion
 2M
 $ cd ..
 $ hg update --clean tip
-U    $TESTTMP/sub/t/s/alpha
+U    *s/alpha (glob)
-Fetching external item into '$TESTTMP/sub/t/s/externals'
+Fetching external item into '*s/externals'* (glob)
 Checked out external at revision 1.
 Checked out revision 3.
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ cd s
 $ svnversion
 3
 $ cd ..
 $ cd s
-$ svn update -r 1
+$ svn update -qr 1
-U    alpha
-U   .
-Fetching external item into 'externals'
-Updated external to revision 1.
-Updated to revision 1.
 $ cd ..
 $ hg update 1
 subrepository sources for s differ (in checked out version)
 use (l)ocal source (1) or (r)emote source (2)?
 l
 $ svnversion
 1M
 $ cd ..
 Sticky repository, update --clean
-$ hg update --clean tip
+$ hg update --clean tip | grep -v s/externals/other
-U    $TESTTMP/sub/t/s/alpha
+U    *s/alpha (glob)
-U   $TESTTMP/sub/t/s
+U   *s (glob)
-Fetching external item into '$TESTTMP/sub/t/s/externals'
+Fetching external item into '*s/externals'* (glob)
 Checked out external at revision 1.
 Checked out revision 3.
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg id -n
 3
 $ cd ..
 Test subrepo already at intended revision:
 $ cd s
-$ svn update -r 2
+$ svn update -qr 2
-U    alpha
-Fetching external item into 'externals'
-Updated external to revision 1.
-Updated to revision 2.
 $ cd ..
 $ hg update 1
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg id -n
 1+
 $ echo epsilon.py > dir/epsilon.py
 $ svn add dir
 A         dir
 A         dir/epsilon.py
 $ svn ci -m 'Add dir/epsilon.py'
-Adding         src/dir
+Adding         *dir (glob)
-Adding         src/dir/epsilon.py
+Adding         *dir/epsilon.py (glob)
 Transmitting file data .
 Committed revision 6.
 $ cd ../..
 $ hg init rebaserepo
 $ cd rebaserepo
 $ echo a > a
 $ hg ci -Am adda
 adding a
 $ hg up 0
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-$ svn up -r6 s
+$ svn up -qr6 s
-A    s/dir
-A    s/dir/epsilon.py
-Fetching external item into 's/externals'
-Updated external to revision 1.
-Updated to revision 6.
 $ hg ci -m updatesub
 committing subrepository s
 created new head
 $ echo pyc > s/dir/epsilon.pyc
 $ hg up 1
-D    $TESTTMP/rebaserepo/s/dir
+D    *s/dir (glob)
-Fetching external item into '$TESTTMP/rebaserepo/s/externals'
+Fetching external item into '*s/externals'* (glob)
 Checked out external at revision 1.
 Checked out revision 5.
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ if "$TESTDIR/hghave" -q svn15; then
 created new head
 Switching back to the head where we have another path mapped to the
 same subrepo should work if the subrepo is clean.
 $ hg co other
-A    $TESTTMP/rebaserepo/obstruct/other
+A    *obstruct/other (glob)
 Checked out revision 1.
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 This is surprising, but is also correct based on the current code:
 $ echo "updating should (maybe) fail" > obstruct/other
 [255]
 Point to a Subversion branch which has since been deleted and recreated
 First, create that condition in the repository.
-$ hg ci --subrepos -m cleanup
+$ hg ci --subrepos -m cleanup | grep -v Updating
 committing subrepository obstruct
 Sending        obstruct/other
 Transmitting file data .
 Committed revision 7.
 At revision 7.
 Committed revision 11.
 $ svn copy -m "recreate branch" $SVNREPO/trunk $SVNREPO/branch
 Committed revision 12.
-$ svn up
+$ svn up -q
-D    somethingold
-Updated to revision 12.
 $ echo "something new" > somethingnew
 $ svn add somethingnew
 A         somethingnew
 $ svn ci -m 'Something new'
 Adding         somethingnew
 Checked out revision 10.
 $ echo "recreated =        [svn]       $SVNREPO/branch" >> .hgsub
 $ hg ci -m addsub
 committing subrepository recreated
 $ cd recreated
-$ svn up
+$ svn up -q
-D    somethingold
-A    somethingnew
-Updated to revision 13.
 $ cd ..
 $ hg ci -m updatesub
 committing subrepository recreated
 $ hg up -r-2
-D    $TESTTMP/rebaserepo/recreated/somethingnew
+D    *recreated/somethingnew (glob)
-A    $TESTTMP/rebaserepo/recreated/somethingold
+A    *recreated/somethingold (glob)
 Checked out revision 10.
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ test -f recreated/somethingold

branch	stable
changeset 15607	fab28a577a38
parent 15372	695ac6aca77f
child 16073	b254f827b7a6
child 16450	c9c8c9053119