[PATCH stable] test-identify: add coverage for multiple parents

David Carr davidmc24 at gmail.com
Tue Sep 11 19:02:23 CDT 2012


# HG changeset patch
# User David M. Carr  <david at carrclan.us>
# Date 1347332263 14400
# Branch stable
# Node ID 18512bcf13ab336681f6ccac7fc2e9e18873fe7d
# Parent  8085fed2bf0a921a401f44fa13fa7110184d1d4e
test-identify: add coverage for multiple parents

diff -r 8085fed2bf0a -r 18512bcf13ab tests/test-identify.t
--- a/tests/test-identify.t	Mon Sep 03 17:25:50 2012 +0100
+++ b/tests/test-identify.t	Mon Sep 10 22:57:43 2012 -0400
@@ -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


More information about the Mercurial-devel mailing list