Mercurial > evolve

comparison tests/test-evolve-effectflags.t @ 3592:7a5c3175015e mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:32:54 +0100
parents 98941c28f3e2 3e2abd40da07
children
comparison
equal deleted inserted replaced
3591:98941c28f3e2 3592:7a5c3175015e
32 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (*) {'ef1': '1', 'user': 'test'} (glob) 32 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (*) {'ef1': '1', 'user': 'test'} (glob)
33 $ hg obslog . 33 $ hg obslog .
34 @ fdf9bde5129a (2) A1 34 @ fdf9bde5129a (2) A1
35 | 35 |
36 x 471f378eab4c (1) A0 36 x 471f378eab4c (1) A0
37 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) 37 rewritten(description) as fdf9bde5129a by test (*) (glob)
38 38
39 $ hg log --hidden -r "desc(A0)" 39 $ hg log --hidden -r "desc(A0)"
40 changeset: 1:471f378eab4c 40 changeset: 1:471f378eab4c
41 user: test 41 user: test
42 date: Thu Jan 01 00:00:00 1970 +0000 42 date: Thu Jan 01 00:00:00 1970 +0000
43 obsolete: reworded as fdf9bde5129a
44 summary: A0 43 summary: A0
45 44
46 45
47 amend touching the user only 46 amend touching the user only
48 ---------------------------- 47 ----------------------------
56 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (*) {'ef1': '16', 'user': 'test'} (glob) 55 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (*) {'ef1': '16', 'user': 'test'} (glob)
57 $ hg obslog . 56 $ hg obslog .
58 @ 5485c92d3433 (4) B0 57 @ 5485c92d3433 (4) B0
59 | 58 |
60 x ef4a313b1e0a (3) B0 59 x ef4a313b1e0a (3) B0
61 rewritten(user) as 5485c92d3433 by test (Thu Jan 01 00:00:00 1970 +0000) 60 rewritten(user) as 5485c92d3433 by test (*) (glob)
62 61
63 $ hg log --hidden -r "ef4a313b1e0a" 62 $ hg log --hidden -r "ef4a313b1e0a"
64 changeset: 3:ef4a313b1e0a 63 changeset: 3:ef4a313b1e0a
65 user: test 64 user: test
66 date: Thu Jan 01 00:00:00 1970 +0000 65 date: Thu Jan 01 00:00:00 1970 +0000
67 obsolete: reauthored as 5485c92d3433
68 summary: B0 66 summary: B0
69 67
70 68
71 amend touching the date only 69 amend touching the date only
72 ---------------------------- 70 ----------------------------
80 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (*) {'ef1': '32', 'user': 'test'} (glob) 78 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (*) {'ef1': '32', 'user': 'test'} (glob)
81 $ hg obslog . 79 $ hg obslog .
82 @ 4dd84345082e (6) B1 80 @ 4dd84345082e (6) B1
83 | 81 |
84 x 2ef0680ff450 (5) B1 82 x 2ef0680ff450 (5) B1
85 rewritten(date) as 4dd84345082e by test (Thu Jan 01 00:00:00 1970 +0000) 83 rewritten(date) as 4dd84345082e by test (*) (glob)
86 84
87 $ hg log --hidden -r "2ef0680ff450" 85 $ hg log --hidden -r "2ef0680ff450"
88 changeset: 5:2ef0680ff450 86 changeset: 5:2ef0680ff450
89 user: test 87 user: test
90 date: Thu Jan 01 00:00:00 1970 +0000 88 date: Thu Jan 01 00:00:00 1970 +0000
91 obsolete: date-changed as 4dd84345082e
92 summary: B1 89 summary: B1
93 90
94 91
95 amend touching the branch only 92 amend touching the branch only
96 ---------------------------- 93 ----------------------------
108 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (*) {'ef1': '64', 'user': 'test'} (glob) 105 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (*) {'ef1': '64', 'user': 'test'} (glob)
109 $ hg obslog . 106 $ hg obslog .
110 @ 14a01456e057 (9) B2 107 @ 14a01456e057 (9) B2
111 | 108 |
112 x bd3db8264cee (7) B2 109 x bd3db8264cee (7) B2
113 rewritten(branch) as 14a01456e057 by test (Thu Jan 01 00:00:00 1970 +0000) 110 rewritten(branch) as 14a01456e057 by test (*) (glob)
114 111
115 $ hg log --hidden -r "bd3db8264cee" 112 $ hg log --hidden -r "bd3db8264cee"
116 changeset: 7:bd3db8264cee 113 changeset: 7:bd3db8264cee
117 user: test 114 user: test
118 date: Thu Jan 01 00:00:00 1970 +0000 115 date: Thu Jan 01 00:00:00 1970 +0000
119 obsolete: branch-changed as 14a01456e057
120 summary: B2 116 summary: B2
121 117
122 118
123 $ hg up default 119 $ hg up default
124 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 120 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
137 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (*) {'ef1': '4', 'user': 'test'} (glob) 133 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (*) {'ef1': '4', 'user': 'test'} (glob)
138 $ hg obslog . 134 $ hg obslog .
139 @ da86aa2f19a3 (12) D0 135 @ da86aa2f19a3 (12) D0
140 | 136 |
141 x c85eff83a034 (11) D0 137 x c85eff83a034 (11) D0
142 rewritten(parent) as da86aa2f19a3 by test (Thu Jan 01 00:00:00 1970 +0000) 138 rewritten(parent) as da86aa2f19a3 by test (*) (glob)
143 139
144 $ hg log --hidden -r "c85eff83a034" 140 $ hg log --hidden -r "c85eff83a034"
145 changeset: 11:c85eff83a034 141 changeset: 11:c85eff83a034
146 user: test 142 user: test
147 date: Thu Jan 01 00:00:00 1970 +0000 143 date: Thu Jan 01 00:00:00 1970 +0000
148 obsolete: rebased as da86aa2f19a3
149 summary: D0 144 summary: D0
150 145
151 146
152 amend touching the diff 147 amend touching the diff
153 ----------------------- 148 -----------------------
163 ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (*) {'ef1': '8', 'user': 'test'} (glob) 158 ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (*) {'ef1': '8', 'user': 'test'} (glob)
164 $ hg obslog . 159 $ hg obslog .
165 @ 75781fdbdbf5 (15) E0 160 @ 75781fdbdbf5 (15) E0
166 | 161 |
167 x ebfe0333e0d9 (13) E0 162 x ebfe0333e0d9 (13) E0
168 rewritten(content) as 75781fdbdbf5 by test (Thu Jan 01 00:00:00 1970 +0000) 163 rewritten(content) as 75781fdbdbf5 by test (*) (glob)
169 164
170 $ hg log --hidden -r "ebfe0333e0d9" 165 $ hg log --hidden -r "ebfe0333e0d9"
171 changeset: 13:ebfe0333e0d9 166 changeset: 13:ebfe0333e0d9
172 user: test 167 user: test
173 date: Thu Jan 01 00:00:00 1970 +0000 168 date: Thu Jan 01 00:00:00 1970 +0000
174 obsolete: amended as 75781fdbdbf5
175 summary: E0 169 summary: E0
176 170
177 171
178 amend with multiple effect (desc and meta) 172 amend with multiple effect (desc and meta)
179 ------------------------------------------- 173 -------------------------------------------
190 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (*) {'ef1': '113', 'user': 'test'} (glob) 184 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (*) {'ef1': '113', 'user': 'test'} (glob)
191 $ hg obslog . 185 $ hg obslog .
192 @ a94e0fd5f1c8 (18) F1 186 @ a94e0fd5f1c8 (18) F1
193 | 187 |
194 x fad47e5bd78e (16) F0 188 x fad47e5bd78e (16) F0
195 rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (Thu Jan 01 00:00:00 1970 +0000) 189 rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (*) (glob)
196 190
197 $ hg log --hidden -r "fad47e5bd78e" 191 $ hg log --hidden -r "fad47e5bd78e"
198 changeset: 16:fad47e5bd78e 192 changeset: 16:fad47e5bd78e
199 user: test 193 user: test
200 date: Thu Jan 01 00:00:00 1970 +0000 194 date: Thu Jan 01 00:00:00 1970 +0000
201 obsolete: rewritten as a94e0fd5f1c8
202 summary: F0 195 summary: F0
203 196
204 197
205 rebase not touching the diff 198 rebase not touching the diff
206 ---------------------------- 199 ----------------------------
245 merging H0 238 merging H0
246 $ hg obslog tip 239 $ hg obslog tip
247 o e509e2eb3df5 (22) H1 240 o e509e2eb3df5 (22) H1
248 | 241 |
249 x b57fed8d8322 (20) H1 242 x b57fed8d8322 (20) H1
250 rewritten(parent) as e509e2eb3df5 by test (Thu Jan 01 00:00:00 1970 +0000) 243 rewritten(parent) as e509e2eb3df5 by test (*) (glob)
251 244
252 $ hg log --hidden -r "b57fed8d8322" 245 $ hg log --hidden -r "b57fed8d8322"
253 changeset: 20:b57fed8d8322 246 changeset: 20:b57fed8d8322
254 branch: my-other-branch 247 branch: my-other-branch
255 user: test 248 user: test
256 date: Thu Jan 01 00:00:00 1970 +0000 249 date: Thu Jan 01 00:00:00 1970 +0000
257 obsolete: rebased as e509e2eb3df5
258 summary: H1 250 summary: H1
259 251
260 amend closing the branch should be detected as meta change 252 amend closing the branch should be detected as meta change
261 ---------------------------------------------------------- 253 ----------------------------------------------------------
262 254
270 262
271 $ hg obslog . 263 $ hg obslog .
272 @ 12c6238b5e37 (26) I0 264 @ 12c6238b5e37 (26) I0
273 | 265 |
274 x 2f599e54c1c6 (24) I0 266 x 2f599e54c1c6 (24) I0
275 rewritten(meta) as 12c6238b5e37 by test (Thu Jan 01 00:00:00 1970 +0000) 267 rewritten(meta) as 12c6238b5e37 by test (*) (glob)
276 268
277 $ hg log --hidden -r "2f599e54c1c6" 269 $ hg log --hidden -r "2f599e54c1c6"
278 changeset: 24:2f599e54c1c6 270 changeset: 24:2f599e54c1c6
279 branch: closedbranch 271 branch: closedbranch
280 user: test 272 user: test
281 date: Thu Jan 01 00:00:00 1970 +0000 273 date: Thu Jan 01 00:00:00 1970 +0000
282 obsolete: meta-changed as 12c6238b5e37
283 summary: I0 274 summary: I0
284 275