equal
deleted
inserted
replaced
343 deleted file mode 100644 |
343 deleted file mode 100644 |
344 examine changes to '.hgsub'? [Ynsfdaq?] |
344 examine changes to '.hgsub'? [Ynsfdaq?] |
345 % debugsub should be empty |
345 % debugsub should be empty |
346 |
346 |
347 $ cd .. |
347 $ cd .. |
|
348 |
|
349 |
|
350 handle svn subrepos safely |
|
351 |
|
352 $ svnadmin create svn-repo-2499 |
|
353 $ curpath=`pwd | tr '\\\\' /` |
|
354 $ expr "$svnpath" : "\/" > /dev/null |
|
355 > if [ $? -ne 0 ]; then |
|
356 > curpath="/$curpath" |
|
357 > fi |
|
358 $ svnurl="file://$curpath/svn-repo-2499/project" |
|
359 $ mkdir -p svn-project-2499/trunk |
|
360 $ svn import -m 'init project' svn-project-2499 "$svnurl" |
|
361 Adding svn-project-2499/trunk |
|
362 |
|
363 Committed revision 1. |
|
364 |
|
365 qnew on repo w/svn subrepo |
|
366 $ mkrepo repo-2499-svn-subrepo |
|
367 $ svn co "$svnurl"/trunk sub |
|
368 Checked out revision 1. |
|
369 $ echo 'sub = [svn]sub' >> .hgsub |
|
370 $ hg add .hgsub |
|
371 $ hg status -S |
|
372 A .hgsub |
|
373 ? sub/.svn/entries |
|
374 $ hg qnew -m0 0.diff |
|
375 committing subrepository sub |
|
376 $ cd sub |
|
377 $ echo a > a |
|
378 $ svn add a |
|
379 A a |
|
380 $ svn st |
|
381 A a |
|
382 $ cd .. |
|
383 $ hg status -S # doesn't show status for svn subrepos (yet) |
|
384 $ hg qnew -m1 1.diff |
|
385 abort: uncommitted changes in subrepository sub |
|
386 [255] |