##// END OF EJS Templates
test-subrepo-svn.t: partially adapt for Windows...
Eduard-Cristian Stefan -
r17032:7dd82e0c default
parent child Browse files
Show More
@@ -24,17 +24,17 b' create subversion repo'
24 $ echo alpha > src/alpha
24 $ echo alpha > src/alpha
25 $ svn add src
25 $ svn add src
26 A src
26 A src
27 A src/alpha
27 A src/alpha (glob)
28 $ mkdir externals
28 $ mkdir externals
29 $ echo other > externals/other
29 $ echo other > externals/other
30 $ svn add externals
30 $ svn add externals
31 A externals
31 A externals
32 A externals/other
32 A externals/other (glob)
33 $ svn ci -m 'Add alpha'
33 $ svn ci -m 'Add alpha'
34 Adding externals
34 Adding externals
35 Adding externals/other
35 Adding externals/other (glob)
36 Adding src
36 Adding src
37 Adding src/alpha
37 Adding src/alpha (glob)
38 Transmitting file data ..
38 Transmitting file data ..
39 Committed revision 1.
39 Committed revision 1.
40 $ svn up -q
40 $ svn up -q
@@ -174,7 +174,7 b' this commit from hg will fail'
174 this commit fails because of meta changes
174 this commit fails because of meta changes
175
175
176 $ svn propset svn:mime-type 'text/html' s/alpha
176 $ svn propset svn:mime-type 'text/html' s/alpha
177 property 'svn:mime-type' set on 's/alpha'
177 property 'svn:mime-type' set on 's/alpha' (glob)
178 $ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date'
178 $ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date'
179 committing subrepository s
179 committing subrepository s
180 abort: svn:*Commit failed (details follow): (glob)
180 abort: svn:*Commit failed (details follow): (glob)
@@ -205,7 +205,7 b' this commit fails because of externals c'
205 this commit fails because of externals meta changes
205 this commit fails because of externals meta changes
206
206
207 $ svn propset svn:mime-type 'text/html' s/externals/other
207 $ svn propset svn:mime-type 'text/html' s/externals/other
208 property 'svn:mime-type' set on 's/externals/other'
208 property 'svn:mime-type' set on 's/externals/other' (glob)
209 $ hg ci --subrepos -m 'amend externals from hg'
209 $ hg ci --subrepos -m 'amend externals from hg'
210 committing subrepository s
210 committing subrepository s
211 abort: cannot commit svn externals
211 abort: cannot commit svn externals
@@ -389,7 +389,7 b' Sticky subrepository, file changes and r'
389 $ cd ..
389 $ cd ..
390
390
391 Sticky repository, update --clean
391 Sticky repository, update --clean
392 $ hg update --clean tip | grep -v s/externals/other
392 $ hg update --clean tip | grep -v 's[/\]externals[/\]other'
393 U *s/alpha (glob)
393 U *s/alpha (glob)
394 U *s (glob)
394 U *s (glob)
395
395
@@ -426,7 +426,7 b' are unknown directories being replaced b'
426 $ echo epsilon.py > dir/epsilon.py
426 $ echo epsilon.py > dir/epsilon.py
427 $ svn add dir
427 $ svn add dir
428 A dir
428 A dir
429 A dir/epsilon.py
429 A dir/epsilon.py (glob)
430 $ svn ci -m 'Add dir/epsilon.py'
430 $ svn ci -m 'Add dir/epsilon.py'
431 Adding *dir (glob)
431 Adding *dir (glob)
432 Adding *dir/epsilon.py (glob)
432 Adding *dir/epsilon.py (glob)
@@ -491,7 +491,7 b' First, create that condition in the repo'
491
491
492 $ hg ci --subrepos -m cleanup | grep -v Updating
492 $ hg ci --subrepos -m cleanup | grep -v Updating
493 committing subrepository obstruct
493 committing subrepository obstruct
494 Sending obstruct/other
494 Sending obstruct/other (glob)
495 Transmitting file data .
495 Transmitting file data .
496 Committed revision 7.
496 Committed revision 7.
497 At revision 7.
497 At revision 7.
@@ -527,7 +527,7 b' First, create that condition in the repo'
527 $ cd ..
527 $ cd ..
528 $ rm -rf tempwc
528 $ rm -rf tempwc
529 $ svn co "$SVNREPO/branch"@10 recreated
529 $ svn co "$SVNREPO/branch"@10 recreated
530 A recreated/somethingold
530 A recreated/somethingold (glob)
531 Checked out revision 10.
531 Checked out revision 10.
532 $ echo "recreated = [svn] $SVNREPO/branch" >> .hgsub
532 $ echo "recreated = [svn] $SVNREPO/branch" >> .hgsub
533 $ hg ci -m addsub
533 $ hg ci -m addsub
@@ -559,9 +559,15 b' Test archive'
559 Test forgetting files, not implemented in svn subrepo, used to
559 Test forgetting files, not implemented in svn subrepo, used to
560 traceback
560 traceback
561
561
562 #if no-windows
562 $ hg forget 'notafile*'
563 $ hg forget 'notafile*'
563 notafile*: No such file or directory
564 notafile*: No such file or directory
564 [1]
565 [1]
566 #else
567 $ hg forget 'notafile'
568 notafile: * (glob)
569 [1]
570 #endif
565
571
566 Test a subrepo referencing a just moved svn path. Last commit rev will
572 Test a subrepo referencing a just moved svn path. Last commit rev will
567 be different from the revision, and the path will be different as
573 be different from the revision, and the path will be different as
@@ -572,13 +578,13 b' well.'
572 $ mkdir trunk/subdir branches
578 $ mkdir trunk/subdir branches
573 $ echo a > trunk/subdir/a
579 $ echo a > trunk/subdir/a
574 $ svn add trunk/subdir branches
580 $ svn add trunk/subdir branches
575 A trunk/subdir
581 A trunk/subdir (glob)
576 A trunk/subdir/a
582 A trunk/subdir/a (glob)
577 A branches
583 A branches
578 $ svn ci -m addsubdir
584 $ svn ci -m addsubdir
579 Adding branches
585 Adding branches
580 Adding trunk/subdir
586 Adding trunk/subdir (glob)
581 Adding trunk/subdir/a
587 Adding trunk/subdir/a (glob)
582 Transmitting file data .
588 Transmitting file data .
583 Committed revision 14.
589 Committed revision 14.
584 $ svn cp -m branchtrunk $SVNREPO/trunk $SVNREPO/branches/somebranch
590 $ svn cp -m branchtrunk $SVNREPO/trunk $SVNREPO/branches/somebranch
@@ -589,7 +595,7 b' well.'
589 $ hg init repo2
595 $ hg init repo2
590 $ cd repo2
596 $ cd repo2
591 $ svn co $SVNREPO/branches/somebranch/subdir
597 $ svn co $SVNREPO/branches/somebranch/subdir
592 A subdir/a
598 A subdir/a (glob)
593 Checked out revision 15.
599 Checked out revision 15.
594 $ echo "subdir = [svn] $SVNREPO/branches/somebranch/subdir" > .hgsub
600 $ echo "subdir = [svn] $SVNREPO/branches/somebranch/subdir" > .hgsub
595 $ hg add .hgsub
601 $ hg add .hgsub
General Comments 0
You need to be logged in to leave comments. Login now