Mercurial > hg

comparison tests/test-subrepo-svn.t @ 23963:8f02682ff3b0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: don't abort in add when non-hg subrepos are present (issue4513) This change should have been part of 9994f45ba714.
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 27 Jan 2015 20:57:43 -0500
parents c63a09b6b337
children 1ef96a3b8b89
comparison
equal deleted inserted replaced
23962:1f3b94e8dc40 23963:8f02682ff3b0
437 $ svn co -r5 --quiet "$SVNREPOURL"/src s 437 $ svn co -r5 --quiet "$SVNREPOURL"/src s
438 $ echo "s = [svn] $SVNREPOURL/src" >> .hgsub 438 $ echo "s = [svn] $SVNREPOURL/src" >> .hgsub
439 $ hg add .hgsub 439 $ hg add .hgsub
440 $ hg ci -m addsub 440 $ hg ci -m addsub
441 $ echo a > a 441 $ echo a > a
442 $ hg ci -Am adda 442 $ hg add .
443 adding a 443 adding a
444 $ hg ci -m adda
444 $ hg up 0 445 $ hg up 0
445 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 446 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
446 $ svn up -qr6 s 447 $ svn up -qr6 s
447 $ hg ci -m updatesub 448 $ hg ci -m updatesub
448 created new head 449 created new head