[PATCH 2 of 2 STABLE] tests: added regression tests for issue 3153

[Renato Cunha]

# HG changeset patch
# User Renato Cunha <renato at renatocunha.com>
# Date 1323872880 7200
# Node ID 76d8bf9736b59b619d9166434efaf9e3788012fe
# Parent  6aaafc6ab31322c2d89b66c37f993121eaebe53d
tests: added regression tests for issue 3153

diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -1017,3 +1017,53 @@
   $ hg st -S
   ? s/f19
   $ rm s/f19
+
+Test issue3153: diff -S with deleted subrepos
+  $ hg up -r 1
+  1 files updated, 0 files merged, 7 files removed, 0 files unresolved
+  $ echo '' > .hgsub
+  $ hg ci -m removesubrepos
+  created new head
+  $ hg diff --nodates -r tip -r 0 -S
+  diff -r 4e766c818895 -r 795943cd673b .hgsub
+  --- a/.hgsub
+  +++ b/.hgsub
+  @@ -1,1 +1,1 @@
+  -
+  +s = s
+  diff -r 4e766c818895 -r 795943cd673b .hgsubstate
+  --- a/.hgsubstate
+  +++ b/.hgsubstate
+  @@ -0,0 +1,1 @@
+  +0000000000000000000000000000000000000000 s
+  diff -r 4e766c818895 -r 795943cd673b f1
+  --- a/f1
+  +++ /dev/null
+  @@ -1,1 +0,0 @@
+  -c1
+  $ hg diff --nodates -r 0 -r tip -S
+  diff -r 795943cd673b -r 4e766c818895 .hgsub
+  --- a/.hgsub
+  +++ b/.hgsub
+  @@ -1,1 +1,1 @@
+  -s = s
+  +
+  diff -r 795943cd673b -r 4e766c818895 .hgsubstate
+  --- a/.hgsubstate
+  +++ b/.hgsubstate
+  @@ -1,1 +0,0 @@
+  -0000000000000000000000000000000000000000 s
+  diff -r 795943cd673b -r 4e766c818895 f1
+  --- /dev/null
+  +++ b/f1
+  @@ -0,0 +1,1 @@
+  +c1
+  diff -r 000000000000 s/f2
+  --- /dev/null
+  +++ b/s/f2
+  @@ -0,0 +1,1 @@
+  +c2
+  $ echo s = s > .hgsub
+  $ hg commit -m 're-added .hgsub'
+  committing subrepository s
+