Mercurial > public > mercurial-scm > hg-stable

diff 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
line wrap: on
line diff
--- a/tests/test-subrepo-svn.t	Tue Jan 27 10:14:23 2015 -0500
+++ b/tests/test-subrepo-svn.t	Tue Jan 27 20:57:43 2015 -0500
@@ -439,8 +439,9 @@
   $ hg add .hgsub
   $ hg ci -m addsub
   $ echo a > a
-  $ hg ci -Am adda
+  $ hg add .
   adding a
+  $ hg ci -m adda
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ svn up -qr6 s