##// END OF EJS Templates
tests: suppress verbose output of svn transaction...
Yuya Nishihara -
r26374:048e41e9 default
parent child Browse files
Show More
@@ -27,10 +27,7 b' handle svn subrepos safely'
27 27 #endif
28 28
29 29 $ mkdir -p svn-project-2499/trunk
30 $ svn import -m 'init project' svn-project-2499 "$SVNREPOURL"
31 Adding svn-project-2499/trunk (glob)
32
33 Committed revision 1.
30 $ svn import -qm 'init project' svn-project-2499 "$SVNREPOURL"
34 31
35 32 qnew on repo w/svn subrepo
36 33 $ mkrepo repo-2499-svn-subrepo
@@ -7,6 +7,10 b''
7 7 $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
8 8 #endif
9 9
10 $ filter_svn_output () {
11 > egrep -v 'Committing|Transmitting|Updating' || true
12 > }
13
10 14 create subversion repo
11 15
12 16 $ WCROOT="`pwd`/svn-wc"
@@ -24,21 +28,12 b' create subversion repo'
24 28 $ svn add externals
25 29 A externals
26 30 A externals/other (glob)
27 $ svn ci -m 'Add alpha'
28 Adding externals
29 Adding externals/other (glob)
30 Adding src
31 Adding src/alpha (glob)
32 Transmitting file data ..
33 Committed revision 1.
31 $ svn ci -qm 'Add alpha'
34 32 $ svn up -q
35 33 $ echo "externals -r1 $SVNREPOURL/externals" > extdef
36 34 $ svn propset -F extdef svn:externals src
37 35 property 'svn:externals' set on 'src'
38 $ svn ci -m 'Setting externals'
39 Sending src
40
41 Committed revision 2.
36 $ svn ci -qm 'Setting externals'
42 37 $ cd ..
43 38
44 39 create hg repo
@@ -98,10 +93,9 b' change file in svn and hg, commit'
98 93 commit: 1 modified, 1 subrepos
99 94 update: (current)
100 95 phases: 2 draft
101 $ hg commit --subrepos -m 'Message!' | grep -v Updating
96 $ hg commit --subrepos -m 'Message!' | filter_svn_output
102 97 committing subrepository s
103 98 Sending*s/alpha (glob)
104 Transmitting file data .
105 99 Committed revision 3.
106 100
107 101 Fetching external item into '*s/externals'* (glob)
@@ -128,9 +122,7 b' missing svn file, commit should fail'
128 122 add an unrelated revision in svn and update the subrepo to without
129 123 bringing any changes.
130 124
131 $ svn mkdir "$SVNREPOURL/unrelated" -m 'create unrelated'
132
133 Committed revision 4.
125 $ svn mkdir "$SVNREPOURL/unrelated" -qm 'create unrelated'
134 126 $ svn up -q s
135 127 $ hg sum
136 128 parent: 2:* tip (glob)
@@ -153,10 +145,7 b' add a commit from svn'
153 145 $ echo xyz >> alpha
154 146 $ svn propset svn:mime-type 'text/xml' alpha
155 147 property 'svn:mime-type' set on 'alpha'
156 $ svn ci -m 'amend a from svn'
157 Sending *alpha (glob)
158 Transmitting file data .
159 Committed revision 5.
148 $ svn ci -qm 'amend a from svn'
160 149 $ cd ../../sub/t
161 150
162 151 this commit from hg will fail
@@ -429,11 +418,7 b' are unknown directories being replaced b'
429 418 $ svn add dir
430 419 A dir
431 420 A dir/epsilon.py (glob)
432 $ svn ci -m 'Add dir/epsilon.py'
433 Adding *dir (glob)
434 Adding *dir/epsilon.py (glob)
435 Transmitting file data .
436 Committed revision 6.
421 $ svn ci -qm 'Add dir/epsilon.py'
437 422 $ cd ../..
438 423 $ hg init rebaserepo
439 424 $ cd rebaserepo
@@ -495,41 +480,26 b' This is surprising, but is also correct '
495 480 Point to a Subversion branch which has since been deleted and recreated
496 481 First, create that condition in the repository.
497 482
498 $ hg ci --subrepos -m cleanup | grep -v Updating
483 $ hg ci --subrepos -m cleanup | filter_svn_output
499 484 committing subrepository obstruct
500 485 Sending obstruct/other (glob)
501 Transmitting file data .
502 486 Committed revision 7.
503 487 At revision 7.
504 $ svn mkdir -m "baseline" $SVNREPOURL/trunk
505
506 Committed revision 8.
507 $ svn copy -m "initial branch" $SVNREPOURL/trunk $SVNREPOURL/branch
508
509 Committed revision 9.
488 $ svn mkdir -qm "baseline" $SVNREPOURL/trunk
489 $ svn copy -qm "initial branch" $SVNREPOURL/trunk $SVNREPOURL/branch
510 490 $ svn co --quiet "$SVNREPOURL"/branch tempwc
511 491 $ cd tempwc
512 492 $ echo "something old" > somethingold
513 493 $ svn add somethingold
514 494 A somethingold
515 $ svn ci -m 'Something old'
516 Adding somethingold
517 Transmitting file data .
518 Committed revision 10.
519 $ svn rm -m "remove branch" $SVNREPOURL/branch
520
521 Committed revision 11.
522 $ svn copy -m "recreate branch" $SVNREPOURL/trunk $SVNREPOURL/branch
523
524 Committed revision 12.
495 $ svn ci -qm 'Something old'
496 $ svn rm -qm "remove branch" $SVNREPOURL/branch
497 $ svn copy -qm "recreate branch" $SVNREPOURL/trunk $SVNREPOURL/branch
525 498 $ svn up -q
526 499 $ echo "something new" > somethingnew
527 500 $ svn add somethingnew
528 501 A somethingnew
529 $ svn ci -m 'Something new'
530 Adding somethingnew
531 Transmitting file data .
532 Committed revision 13.
502 $ svn ci -qm 'Something new'
533 503 $ cd ..
534 504 $ rm -rf tempwc
535 505 $ svn co "$SVNREPOURL/branch"@10 recreated
@@ -610,15 +580,8 b' well.'
610 580 A trunk/subdir (glob)
611 581 A trunk/subdir/a (glob)
612 582 A branches
613 $ svn ci -m addsubdir
614 Adding branches
615 Adding trunk/subdir (glob)
616 Adding trunk/subdir/a (glob)
617 Transmitting file data .
618 Committed revision 14.
619 $ svn cp -m branchtrunk $SVNREPOURL/trunk $SVNREPOURL/branches/somebranch
620
621 Committed revision 15.
583 $ svn ci -qm addsubdir
584 $ svn cp -qm branchtrunk $SVNREPOURL/trunk $SVNREPOURL/branches/somebranch
622 585 $ cd ..
623 586
624 587 $ hg init repo2
@@ -652,14 +615,7 b' Test sanitizing ".hg/hgrc" in subrepo'
652 615 A sub
653 616 A sub/.hg (glob)
654 617 A sub/.hg/hgrc (glob)
655 $ svn ci -m 'add .hg/hgrc to be sanitized at hg update'
656 Adding .hg
657 Adding .hg/hgrc (glob)
658 Adding sub
659 Adding sub/.hg (glob)
660 Adding sub/.hg/hgrc (glob)
661 Transmitting file data ..
662 Committed revision 16.
618 $ svn ci -qm 'add .hg/hgrc to be sanitized at hg update'
663 619 $ svn up -q
664 620 $ cd ..
665 621 $ hg commit -S -m 'commit with svn revision including .hg/hgrc'
General Comments 0
You need to be logged in to leave comments. Login now