Mercurial > public > mercurial-scm > hg

diff tests/test-subrepo-missing.t @ 13017:d0e21c5fde41 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: handle missing subrepo spec file as removed Otherwise, all commands involving a dirstate walk will abort when trying to readone of them. Deleting .hgsub basically breaks a repository.
author Patrick Mezard <pmezard@gmail.com>
date Thu, 18 Nov 2010 23:05:10 +0100
parents
children f73c7b70df68
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-subrepo-missing.t	Thu Nov 18 23:05:10 2010 +0100
@@ -0,0 +1,51 @@
+  $ hg init repo
+  $ cd repo
+  $ hg init subrepo
+  $ echo a > subrepo/a
+  $ hg -R subrepo ci -Am adda
+  adding a
+  $ echo 'subrepo = subrepo' > .hgsub
+  $ hg ci -Am addsubrepo
+  adding .hgsub
+  committing subrepository subrepo
+  $ echo b > subrepo/b
+  $ hg -R subrepo ci -Am addb
+  adding b
+  $ hg ci -m updatedsub
+  committing subrepository subrepo
+
+delete .hgsub and revert it
+
+  $ rm .hgsub
+  $ hg revert .hgsub
+  warning: subrepo spec file .hgsub not found
+
+delete .hgsubstate and revert it
+
+  $ rm .hgsubstate
+  $ hg revert .hgsubstate
+
+delete .hgsub and update
+
+  $ rm .hgsub
+  $ hg up 0
+  warning: subrepo spec file .hgsub not found
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg st
+  ! .hgsub
+  $ ls subrepo
+  a
+
+delete .hgsubstate and update
+
+  $ hg up -C
+  warning: subrepo spec file .hgsub not found
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ rm .hgsubstate
+  $ hg up 0  
+  remote changed .hgsubstate which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg st
+  $ ls subrepo
+  a