[PATCH 1 of 4 RFC V2] test-identify: add coverage for multiple parents

[David Carr]

# HG changeset patch
# User David M. Carr  <david at carrclan.us>
# Date 1347763762 14400
# Node ID 91e6470b474c43967d357e225447dc540b02bd2d
# Parent  fc1a5d0eb3bbb1116051b65dcd2873389f9d7ed4
test-identify: add coverage for multiple parents

diff --git a/tests/test-identify.t b/tests/test-identify.t
--- a/tests/test-identify.t
+++ b/tests/test-identify.t
@@ -109,6 +109,21 @@
   $ hg id --bookmarks -r . http://localhost:$HGPORT1/
   Y Z
 
+with multiple parents
+
+  $ hg commit -ma2
+  $ hg update 0
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo b > b
+  $ hg add b
+  $ hg commit -mb
+  created new head
+  $ hg merge 1
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg id -n -t -b -i
+  d2ae7f538514+bf02f68f2f4a+ 2+1+ default tip
+
 Make sure we do not obscure unknown requires file entries (issue2649)
 
   $ echo fake >> .hg/requires