Mercurial > hg

comparison tests/test-parents.t @ 12316:4134686b83e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add exit codes to unified tests
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Sep 2010 17:51:32 -0500
parents 6c8e824970d1
children f2719b387380
comparison
equal deleted inserted replaced
12315:ca58f6475f1d 12316:4134686b83e1
52 summary: c 52 summary: c
53 53
54 54
55 $ hg parents -r 3 c 55 $ hg parents -r 3 c
56 abort: 'c' not found in manifest! 56 abort: 'c' not found in manifest!
57 [255]
57 58
58 $ hg parents -r 2 59 $ hg parents -r 2
59 changeset: 1:d786049f033a 60 changeset: 1:d786049f033a
60 user: test 61 user: test
61 date: Thu Jan 01 00:00:01 1970 +0000 62 date: Thu Jan 01 00:00:01 1970 +0000
69 summary: a 70 summary: a
70 71
71 72
72 $ hg parents -r 2 ../a 73 $ hg parents -r 2 ../a
73 abort: ../a not under root 74 abort: ../a not under root
75 [255]
74 76
75 77
76 cd dir; hg parents -r 2 ../a 78 cd dir; hg parents -r 2 ../a
77 79
78 $ mkdir dir 80 $ mkdir dir
91 93
92 $ cd .. 94 $ cd ..
93 95
94 $ hg parents -r 2 glob:a 96 $ hg parents -r 2 glob:a
95 abort: can only specify an explicit filename 97 abort: can only specify an explicit filename
98 [255]
96 99
97 100
98 merge working dir with 2 parents, hg parents c 101 merge working dir with 2 parents, hg parents c
99 102
100 $ HGMERGE=true hg merge 103 $ HGMERGE=true hg merge