Mercurial > evolve

comparison tests/test-evolve-obshistory-phase-divergent.t @ 4363:a2fdbece7ce1 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 12:57:25 -0500
parents d00f0c369bc7
children
comparison
equal deleted inserted replaced
4362:8bd60e09dfb4 4363:a2fdbece7ce1
35 user: test 35 user: test
36 date: Thu Jan 01 00:00:00 1970 +0000 36 date: Thu Jan 01 00:00:00 1970 +0000
37 summary: ROOT 37 summary: ROOT
38 38
39 $ hg update --hidden 'desc(A0)' 39 $ hg update --hidden 'desc(A0)'
40 updating to a hidden changeset 471f378eab4c
41 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
42 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 40 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
43 working directory parent is obsolete! (471f378eab4c) 41 working directory parent is obsolete! (471f378eab4c)
44 (use 'hg evolve' to update to its successor: fdf9bde5129a) 42 (use 'hg evolve' to update to its successor: fdf9bde5129a)
45 $ hg phase -p . 43 $ hg phase -p .
46 1 new phase-divergent changesets
47 $ hg log --hidden -G 44 $ hg log --hidden -G
48 * changeset: 2:fdf9bde5129a 45 o changeset: 2:fdf9bde5129a
49 | tag: tip 46 | tag: tip
50 | parent: 0:ea207398892e 47 | parent: 0:ea207398892e
51 | user: test 48 | user: test
52 | date: Thu Jan 01 00:00:00 1970 +0000 49 | date: Thu Jan 01 00:00:00 1970 +0000
53 | instability: phase-divergent 50 | instability: phase-divergent
79 76
80 77
81 78
82 Check that with all option, every changeset is shown 79 Check that with all option, every changeset is shown
83 $ hg obslog --hidden --all 471f378eab4c --patch 80 $ hg obslog --hidden --all 471f378eab4c --patch
84 * fdf9bde5129a (2) A1 81 o fdf9bde5129a (2) A1
85 | 82 |
86 @ 471f378eab4c (1) A0 83 @ 471f378eab4c (1) A0
87 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 84 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
88 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 85 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
89 --- a/changeset-description 86 --- a/changeset-description
119 } 116 }
120 ] 117 ]
121 Check that debugobshistory on the first diverged revision show the revision 118 Check that debugobshistory on the first diverged revision show the revision
122 and the diverent one 119 and the diverent one
123 $ hg obslog fdf9bde5129a --patch 120 $ hg obslog fdf9bde5129a --patch
124 * fdf9bde5129a (2) A1 121 o fdf9bde5129a (2) A1
125 | 122 |
126 @ 471f378eab4c (1) A0 123 @ 471f378eab4c (1) A0
127 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 124 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
128 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 125 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
129 --- a/changeset-description 126 --- a/changeset-description
134 131
135 132
136 133
137 Check that all option show all of them 134 Check that all option show all of them
138 $ hg obslog fdf9bde5129a -a --patch 135 $ hg obslog fdf9bde5129a -a --patch
139 * fdf9bde5129a (2) A1 136 o fdf9bde5129a (2) A1
140 | 137 |
141 @ 471f378eab4c (1) A0 138 @ 471f378eab4c (1) A0
142 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 139 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
143 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 140 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
144 --- a/changeset-description 141 --- a/changeset-description
149 146
150 147
151 Check that debugobshistory on the second diverged revision show the revision 148 Check that debugobshistory on the second diverged revision show the revision
152 and the diverent one 149 and the diverent one
153 $ hg obslog fdf9bde5129a --patch 150 $ hg obslog fdf9bde5129a --patch
154 * fdf9bde5129a (2) A1 151 o fdf9bde5129a (2) A1
155 | 152 |
156 @ 471f378eab4c (1) A0 153 @ 471f378eab4c (1) A0
157 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 154 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
158 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 155 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
159 --- a/changeset-description 156 --- a/changeset-description
163 +A1 160 +A1
164 161
165 162
166 Check that all option show all of them 163 Check that all option show all of them
167 $ hg obslog fdf9bde5129a -a --patch 164 $ hg obslog fdf9bde5129a -a --patch
168 * fdf9bde5129a (2) A1 165 o fdf9bde5129a (2) A1
169 | 166 |
170 @ 471f378eab4c (1) A0 167 @ 471f378eab4c (1) A0
171 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 168 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
172 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 169 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
173 --- a/changeset-description 170 --- a/changeset-description
178 175
179 176
180 Check that debugobshistory on the both diverged revision show a coherent 177 Check that debugobshistory on the both diverged revision show a coherent
181 graph 178 graph
182 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch 179 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch
183 * fdf9bde5129a (2) A1 180 o fdf9bde5129a (2) A1
184 | 181 |
185 @ 471f378eab4c (1) A0 182 @ 471f378eab4c (1) A0
186 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 183 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
187 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 184 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
188 --- a/changeset-description 185 --- a/changeset-description