changeset 12316 | 4134686b83e1 |
parent 11813 | 6c8e824970d1 |
child 16913 | f2719b387380 |
--- a/tests/test-parents.t Thu Sep 16 16:12:26 2010 -0500 +++ b/tests/test-parents.t Thu Sep 16 17:51:32 2010 -0500 @@ -54,6 +54,7 @@ $ hg parents -r 3 c abort: 'c' not found in manifest! + [255] $ hg parents -r 2 changeset: 1:d786049f033a @@ -71,6 +72,7 @@ $ hg parents -r 2 ../a abort: ../a not under root + [255] cd dir; hg parents -r 2 ../a @@ -93,6 +95,7 @@ $ hg parents -r 2 glob:a abort: can only specify an explicit filename + [255] merge working dir with 2 parents, hg parents c