Mercurial > hg
annotate tests/test-parents.t @ 13043:cc40e4f49559
Merge with stable
author | Steve Borho <steve@borho.org> |
---|---|
date | Fri, 26 Nov 2010 18:04:10 -0600 |
parents | 4134686b83e1 |
children | f2719b387380 |
rev | line source |
---|---|
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
1 test parents command |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
2 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
3 $ hg init repo |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
4 $ cd repo |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
5 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
6 no working directory |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
7 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
8 $ hg parents |
4584
0d26e3d0eeeb
Make parents with a file but not a revision use working directory revision.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
9 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
10 $ echo a > a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
11 $ echo b > b |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
12 $ hg ci -Amab -d '0 0' |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
13 adding a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
14 adding b |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
15 $ echo a >> a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
16 $ hg ci -Ama -d '1 0' |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
17 $ echo b >> b |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
18 $ hg ci -Amb -d '2 0' |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
19 $ echo c > c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
20 $ hg ci -Amc -d '3 0' |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
21 adding c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
22 $ hg up -C 1 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
23 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
24 $ echo d > c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
25 $ hg ci -Amc2 -d '4 0' |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
26 adding c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
27 created new head |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
28 $ hg up -C 3 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
29 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
30 |
4584
0d26e3d0eeeb
Make parents with a file but not a revision use working directory revision.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
31 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
32 $ hg parents |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
33 changeset: 3:02d851b7e549 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
34 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
35 date: Thu Jan 01 00:00:03 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
36 summary: c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
37 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
38 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
39 $ hg parents a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
40 changeset: 1:d786049f033a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
41 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
42 date: Thu Jan 01 00:00:01 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
43 summary: a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
44 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
45 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
46 hg parents c, single revision |
4584
0d26e3d0eeeb
Make parents with a file but not a revision use working directory revision.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
47 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
48 $ hg parents c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
49 changeset: 3:02d851b7e549 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
50 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
51 date: Thu Jan 01 00:00:03 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
52 summary: c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
53 |
4584
0d26e3d0eeeb
Make parents with a file but not a revision use working directory revision.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
54 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
55 $ hg parents -r 3 c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
56 abort: 'c' not found in manifest! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11813
diff
changeset
|
57 [255] |
4584
0d26e3d0eeeb
Make parents with a file but not a revision use working directory revision.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
58 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
59 $ hg parents -r 2 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
60 changeset: 1:d786049f033a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
61 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
62 date: Thu Jan 01 00:00:01 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
63 summary: a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
64 |
5299
5a4824f6665c
Test parents behaviour with files.
Patrick Mezard <pmezard@gmail.com>
parents:
4894
diff
changeset
|
65 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
66 $ hg parents -r 2 a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
67 changeset: 1:d786049f033a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
68 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
69 date: Thu Jan 01 00:00:01 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
70 summary: a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
71 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
72 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
73 $ hg parents -r 2 ../a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
74 abort: ../a not under root |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11813
diff
changeset
|
75 [255] |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
76 |
5299
5a4824f6665c
Test parents behaviour with files.
Patrick Mezard <pmezard@gmail.com>
parents:
4894
diff
changeset
|
77 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
78 cd dir; hg parents -r 2 ../a |
4894
be5dc5e3ab2d
hg parents: don't pass an OS-specific path to repo.filectx
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4584
diff
changeset
|
79 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
80 $ mkdir dir |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
81 $ cd dir |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
82 $ hg parents -r 2 ../a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
83 changeset: 1:d786049f033a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
84 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
85 date: Thu Jan 01 00:00:01 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
86 summary: a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
87 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
88 $ hg parents -r 2 path:a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
89 changeset: 1:d786049f033a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
90 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
91 date: Thu Jan 01 00:00:01 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
92 summary: a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
93 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
94 $ cd .. |
4894
be5dc5e3ab2d
hg parents: don't pass an OS-specific path to repo.filectx
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4584
diff
changeset
|
95 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
96 $ hg parents -r 2 glob:a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
97 abort: can only specify an explicit filename |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11813
diff
changeset
|
98 [255] |
4894
be5dc5e3ab2d
hg parents: don't pass an OS-specific path to repo.filectx
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4584
diff
changeset
|
99 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
100 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
101 merge working dir with 2 parents, hg parents c |
4894
be5dc5e3ab2d
hg parents: don't pass an OS-specific path to repo.filectx
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4584
diff
changeset
|
102 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
103 $ HGMERGE=true hg merge |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
104 merging c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
105 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
106 (branch merge, don't forget to commit) |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
107 $ hg parents c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
108 changeset: 3:02d851b7e549 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
109 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
110 date: Thu Jan 01 00:00:03 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
111 summary: c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
112 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
113 changeset: 4:48cee28d4b4e |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
114 tag: tip |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
115 parent: 1:d786049f033a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
116 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
117 date: Thu Jan 01 00:00:04 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
118 summary: c2 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
119 |
4894
be5dc5e3ab2d
hg parents: don't pass an OS-specific path to repo.filectx
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4584
diff
changeset
|
120 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
121 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
122 merge working dir with 1 parent, hg parents |
5299
5a4824f6665c
Test parents behaviour with files.
Patrick Mezard <pmezard@gmail.com>
parents:
4894
diff
changeset
|
123 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
124 $ hg up -C 2 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
125 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
126 $ HGMERGE=true hg merge -r 4 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
127 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
128 (branch merge, don't forget to commit) |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
129 $ hg parents |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
130 changeset: 2:6cfac479f009 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
131 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
132 date: Thu Jan 01 00:00:02 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
133 summary: b |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
134 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
135 changeset: 4:48cee28d4b4e |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
136 tag: tip |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
137 parent: 1:d786049f033a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
138 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
139 date: Thu Jan 01 00:00:04 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
140 summary: c2 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
141 |
5299
5a4824f6665c
Test parents behaviour with files.
Patrick Mezard <pmezard@gmail.com>
parents:
4894
diff
changeset
|
142 |
11813
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
143 merge working dir with 1 parent, hg parents c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
144 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
145 $ hg parents c |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
146 changeset: 4:48cee28d4b4e |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
147 tag: tip |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
148 parent: 1:d786049f033a |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
149 user: test |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
150 date: Thu Jan 01 00:00:04 1970 +0000 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
151 summary: c2 |
6c8e824970d1
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5299
diff
changeset
|
152 |