Show More
| @@ -0,0 +1,52 b'' | |||||
|
|
1 | $ "$TESTDIR/hghave" svn || exit 80 | |||
|
|
2 | ||||
|
|
3 | $ echo "[extensions]" >> $HGRCPATH | |||
|
|
4 | $ echo "mq=" >> $HGRCPATH | |||
|
|
5 | $ echo "[diff]" >> $HGRCPATH | |||
|
|
6 | $ echo "nodates=1" >> $HGRCPATH | |||
|
|
7 | ||||
|
|
8 | fn to create new repository w/dirty subrepo, and cd into it | |||
|
|
9 | $ mkrepo() { | |||
|
|
10 | > hg init $1 | |||
|
|
11 | > cd $1 | |||
|
|
12 | > hg qinit | |||
|
|
13 | > } | |||
|
|
14 | ||||
|
|
15 | ||||
|
|
16 | handle svn subrepos safely | |||
|
|
17 | ||||
|
|
18 | $ svnadmin create svn-repo-2499 | |||
|
|
19 | $ curpath=`pwd | tr '\\\\' /` | |||
|
|
20 | $ expr "$svnpath" : "\/" > /dev/null | |||
|
|
21 | > if [ $? -ne 0 ]; then | |||
|
|
22 | > curpath="/$curpath" | |||
|
|
23 | > fi | |||
|
|
24 | $ svnurl="file://$curpath/svn-repo-2499/project" | |||
|
|
25 | $ mkdir -p svn-project-2499/trunk | |||
|
|
26 | $ svn import -m 'init project' svn-project-2499 "$svnurl" | |||
|
|
27 | Adding svn-project-2499/trunk | |||
|
|
28 | ||||
|
|
29 | Committed revision 1. | |||
|
|
30 | ||||
|
|
31 | qnew on repo w/svn subrepo | |||
|
|
32 | $ mkrepo repo-2499-svn-subrepo | |||
|
|
33 | $ svn co "$svnurl"/trunk sub | |||
|
|
34 | Checked out revision 1. | |||
|
|
35 | $ echo 'sub = [svn]sub' >> .hgsub | |||
|
|
36 | $ hg add .hgsub | |||
|
|
37 | $ hg status -S | |||
|
|
38 | A .hgsub | |||
|
|
39 | ? sub/.svn/entries | |||
|
|
40 | $ hg qnew -m0 0.diff | |||
|
|
41 | committing subrepository sub | |||
|
|
42 | $ cd sub | |||
|
|
43 | $ echo a > a | |||
|
|
44 | $ svn add a | |||
|
|
45 | A a | |||
|
|
46 | $ svn st | |||
|
|
47 | A a | |||
|
|
48 | $ cd .. | |||
|
|
49 | $ hg status -S # doesn't show status for svn subrepos (yet) | |||
|
|
50 | $ hg qnew -m1 1.diff | |||
|
|
51 | abort: uncommitted changes in subrepository sub | |||
|
|
52 | [255] | |||
| @@ -1,5 +1,3 b'' | |||||
| 1 | $ "$TESTDIR/hghave" svn || exit 80 |
|
|||
| 2 |
|
||||
| 3 |
|
|
1 | $ echo "[extensions]" >> $HGRCPATH | |
| 4 | $ echo "mq=" >> $HGRCPATH |
|
2 | $ echo "mq=" >> $HGRCPATH | |
| 5 | $ echo "record=" >> $HGRCPATH |
|
3 | $ echo "record=" >> $HGRCPATH | |
| @@ -347,42 +345,3 b' handle subrepos safely on qrecord' | |||||
| 347 | % debugsub should be empty |
|
345 | % debugsub should be empty | |
| 348 |
|
346 | |||
| 349 | $ cd .. |
|
347 | $ cd .. | |
| 350 |
|
||||
| 351 |
|
||||
| 352 | handle svn subrepos safely |
|
|||
| 353 |
|
||||
| 354 | $ svnadmin create svn-repo-2499 |
|
|||
| 355 | $ curpath=`pwd | tr '\\\\' /` |
|
|||
| 356 | $ expr "$svnpath" : "\/" > /dev/null |
|
|||
| 357 | > if [ $? -ne 0 ]; then |
|
|||
| 358 | > curpath="/$curpath" |
|
|||
| 359 | > fi |
|
|||
| 360 | $ svnurl="file://$curpath/svn-repo-2499/project" |
|
|||
| 361 | $ mkdir -p svn-project-2499/trunk |
|
|||
| 362 | $ svn import -m 'init project' svn-project-2499 "$svnurl" |
|
|||
| 363 | Adding svn-project-2499/trunk |
|
|||
| 364 |
|
||||
| 365 | Committed revision 1. |
|
|||
| 366 |
|
||||
| 367 | qnew on repo w/svn subrepo |
|
|||
| 368 | $ mkrepo repo-2499-svn-subrepo |
|
|||
| 369 | $ svn co "$svnurl"/trunk sub |
|
|||
| 370 | Checked out revision 1. |
|
|||
| 371 | $ echo 'sub = [svn]sub' >> .hgsub |
|
|||
| 372 | $ hg add .hgsub |
|
|||
| 373 | $ hg status -S |
|
|||
| 374 | A .hgsub |
|
|||
| 375 | ? sub/.svn/entries |
|
|||
| 376 | $ hg qnew -m0 0.diff |
|
|||
| 377 | committing subrepository sub |
|
|||
| 378 | $ cd sub |
|
|||
| 379 | $ echo a > a |
|
|||
| 380 | $ svn add a |
|
|||
| 381 | A a |
|
|||
| 382 | $ svn st |
|
|||
| 383 | A a |
|
|||
| 384 | $ cd .. |
|
|||
| 385 | $ hg status -S # doesn't show status for svn subrepos (yet) |
|
|||
| 386 | $ hg qnew -m1 1.diff |
|
|||
| 387 | abort: uncommitted changes in subrepository sub |
|
|||
| 388 | [255] |
|
|||
General Comments 0
You need to be logged in to leave comments.
Login now