equal
deleted
inserted
replaced
468 $ svn co -r5 --quiet "$SVNREPOURL"/externals obstruct |
468 $ svn co -r5 --quiet "$SVNREPOURL"/externals obstruct |
469 $ hg commit -m 'Start making obstructed working copy' |
469 $ hg commit -m 'Start making obstructed working copy' |
470 $ hg book other |
470 $ hg book other |
471 $ hg co -r 'p1(tip)' |
471 $ hg co -r 'p1(tip)' |
472 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
472 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
473 (leaving bookmark other) |
473 $ echo "obstruct = [svn] $SVNREPOURL/src" >> .hgsub |
474 $ echo "obstruct = [svn] $SVNREPOURL/src" >> .hgsub |
474 $ svn co -r5 --quiet "$SVNREPOURL"/src obstruct |
475 $ svn co -r5 --quiet "$SVNREPOURL"/src obstruct |
475 $ hg commit -m 'Other branch which will be obstructed' |
476 $ hg commit -m 'Other branch which will be obstructed' |
476 created new head |
477 created new head |
477 |
478 |
541 $ hg up -r-2 |
542 $ hg up -r-2 |
542 D *recreated/somethingnew (glob) |
543 D *recreated/somethingnew (glob) |
543 A *recreated/somethingold (glob) |
544 A *recreated/somethingold (glob) |
544 Checked out revision 10. |
545 Checked out revision 10. |
545 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
546 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
547 (leaving bookmark other) |
546 $ test -f recreated/somethingold |
548 $ test -f recreated/somethingold |
547 |
549 |
548 Test archive |
550 Test archive |
549 |
551 |
550 $ hg archive -S ../archive-all --debug |
552 $ hg archive -S ../archive-all --debug |