Mercurial > evolve
comparison tests/test-evolve-obshistory-amend-then-fold.t @ 5766:82da27321e91 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 31 Jan 2021 16:15:26 +0800 |
| parents | 8d93e7fc0daa 08c30eef85d3 |
| children | 0f32359bcf3e 55e9987b8384 |
comparison
equal
deleted
inserted
replaced
| 5765:98e87c181e0f | 5766:82da27321e91 |
|---|---|
| 54 | | 54 | |
| 55 | x changeset: 3:b7ea6d14e664 | 55 | x changeset: 3:b7ea6d14e664 |
| 56 | | parent: 1:471f378eab4c | 56 | | parent: 1:471f378eab4c |
| 57 | | user: test | 57 | | user: test |
| 58 | | date: Thu Jan 01 00:00:00 1970 +0000 | 58 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 59 | | obsolete: folded using fold as 4:eb5a0daa2192 | 59 | | obsolete: rewritten using fold as 4:eb5a0daa2192 |
| 60 | | summary: B1 | 60 | | summary: B1 |
| 61 | | | 61 | | |
| 62 | | x changeset: 2:0dec01379d3b | 62 | | x changeset: 2:0dec01379d3b |
| 63 | |/ user: test | 63 | |/ user: test |
| 64 | | date: Thu Jan 01 00:00:00 1970 +0000 | 64 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 66 | | summary: B0 | 66 | | summary: B0 |
| 67 | | | 67 | | |
| 68 | x changeset: 1:471f378eab4c | 68 | x changeset: 1:471f378eab4c |
| 69 |/ user: test | 69 |/ user: test |
| 70 | date: Thu Jan 01 00:00:00 1970 +0000 | 70 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 71 | obsolete: folded using fold as 4:eb5a0daa2192 | 71 | obsolete: rewritten using fold as 4:eb5a0daa2192 |
| 72 | summary: A0 | 72 | summary: A0 |
| 73 | | 73 | |
| 74 o changeset: 0:ea207398892e | 74 o changeset: 0:ea207398892e |
| 75 user: test | 75 user: test |
| 76 date: Thu Jan 01 00:00:00 1970 +0000 | 76 date: Thu Jan 01 00:00:00 1970 +0000 |
| 82 Check that obslog on head shows a coherent graph | 82 Check that obslog on head shows a coherent graph |
| 83 $ hg obslog eb5a0daa2192 --patch --no-origin | 83 $ hg obslog eb5a0daa2192 --patch --no-origin |
| 84 @ eb5a0daa2192 (4) C0 | 84 @ eb5a0daa2192 (4) C0 |
| 85 |\ | 85 |\ |
| 86 x | 471f378eab4c (1) A0 | 86 x | 471f378eab4c (1) A0 |
| 87 / folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | 87 / rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 88 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | 88 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
| 89 | --- a/changeset-description | 89 | --- a/changeset-description |
| 90 | +++ b/changeset-description | 90 | +++ b/changeset-description |
| 91 | @@ -1,1 +1,1 @@ | 91 | @@ -1,1 +1,1 @@ |
| 92 | -A0 | 92 | -A0 |
| 98 | @@ -0,0 +1,1 @@ | 98 | @@ -0,0 +1,1 @@ |
| 99 | +B0 | 99 | +B0 |
| 100 | | 100 | |
| 101 | | 101 | |
| 102 x b7ea6d14e664 (3) B1 | 102 x b7ea6d14e664 (3) B1 |
| 103 | folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | 103 | rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 104 | (No patch available, changesets rebased) | 104 | (No patch available, changesets rebased) |
| 105 | | 105 | |
| 106 x 0dec01379d3b (2) B0 | 106 x 0dec01379d3b (2) B0 |
| 107 reworded(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 107 reworded(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 108 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description | 108 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
| 113 +B1 | 113 +B1 |
| 114 | 114 |
| 115 | 115 |
| 116 $ hg obslog eb5a0daa2192 --patch | 116 $ hg obslog eb5a0daa2192 --patch |
| 117 @ eb5a0daa2192 (4) C0 | 117 @ eb5a0daa2192 (4) C0 |
| 118 |\ folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | 118 |\ rewritten(description, content) from 471f378eab4c using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 119 | | (No patch available, too many predecessors (2)) | 119 | | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
| 120 | | --- a/changeset-description | |
| 121 | | +++ b/changeset-description | |
| 122 | | @@ -1,1 +1,1 @@ | |
| 123 | | -A0 | |
| 124 | | +C0 | |
| 125 | | | |
| 126 | | diff -r 471f378eab4c -r eb5a0daa2192 B0 | |
| 127 | | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 128 | | +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 | |
| 129 | | @@ -0,0 +1,1 @@ | |
| 130 | | +B0 | |
| 131 | | | |
| 132 | | rewritten(description, parent, content) from b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | |
| 133 | | (No patch available, changesets rebased) | |
| 120 | | | 134 | | |
| 121 x | 471f378eab4c (1) A0 | 135 x | 471f378eab4c (1) A0 |
| 122 / | 136 / |
| 123 x b7ea6d14e664 (3) B1 | 137 x b7ea6d14e664 (3) B1 |
| 124 | reworded(description) from 0dec01379d3b using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 138 | reworded(description) from 0dec01379d3b using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 135 Check that obslog on A0 with all option shows everything | 149 Check that obslog on A0 with all option shows everything |
| 136 $ hg obslog 1 --hidden --all --patch --no-origin | 150 $ hg obslog 1 --hidden --all --patch --no-origin |
| 137 @ eb5a0daa2192 (4) C0 | 151 @ eb5a0daa2192 (4) C0 |
| 138 |\ | 152 |\ |
| 139 x | 471f378eab4c (1) A0 | 153 x | 471f378eab4c (1) A0 |
| 140 / folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | 154 / rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 141 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | 155 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
| 142 | --- a/changeset-description | 156 | --- a/changeset-description |
| 143 | +++ b/changeset-description | 157 | +++ b/changeset-description |
| 144 | @@ -1,1 +1,1 @@ | 158 | @@ -1,1 +1,1 @@ |
| 145 | -A0 | 159 | -A0 |
| 151 | @@ -0,0 +1,1 @@ | 165 | @@ -0,0 +1,1 @@ |
| 152 | +B0 | 166 | +B0 |
| 153 | | 167 | |
| 154 | | 168 | |
| 155 x b7ea6d14e664 (3) B1 | 169 x b7ea6d14e664 (3) B1 |
| 156 | folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | 170 | rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 157 | (No patch available, changesets rebased) | 171 | (No patch available, changesets rebased) |
| 158 | | 172 | |
| 159 x 0dec01379d3b (2) B0 | 173 x 0dec01379d3b (2) B0 |
| 160 reworded(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 174 reworded(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 161 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description | 175 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
| 166 +B1 | 180 +B1 |
| 167 | 181 |
| 168 | 182 |
| 169 $ hg obslog 1 --hidden --all --patch | 183 $ hg obslog 1 --hidden --all --patch |
| 170 @ eb5a0daa2192 (4) C0 | 184 @ eb5a0daa2192 (4) C0 |
| 171 |\ folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | 185 |\ rewritten(description, content) from 471f378eab4c using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 172 | | (No patch available, too many predecessors (2)) | 186 | | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
| 187 | | --- a/changeset-description | |
| 188 | | +++ b/changeset-description | |
| 189 | | @@ -1,1 +1,1 @@ | |
| 190 | | -A0 | |
| 191 | | +C0 | |
| 192 | | | |
| 193 | | diff -r 471f378eab4c -r eb5a0daa2192 B0 | |
| 194 | | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 195 | | +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 | |
| 196 | | @@ -0,0 +1,1 @@ | |
| 197 | | +B0 | |
| 198 | | | |
| 199 | | rewritten(description, parent, content) from b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | |
| 200 | | (No patch available, changesets rebased) | |
| 173 | | | 201 | | |
| 174 x | 471f378eab4c (1) A0 | 202 x | 471f378eab4c (1) A0 |
| 175 / | 203 / |
| 176 x b7ea6d14e664 (3) B1 | 204 x b7ea6d14e664 (3) B1 |
| 177 | reworded(description) from 0dec01379d3b using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 205 | reworded(description) from 0dec01379d3b using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 213 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" | 241 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" |
| 214 ], | 242 ], |
| 215 "users": [ | 243 "users": [ |
| 216 "test" | 244 "test" |
| 217 ], | 245 ], |
| 218 "verb": "folded" | 246 "verb": "rewritten" |
| 219 } | 247 } |
| 220 ], | 248 ], |
| 221 "node": "b7ea6d14e664bdc8922221f7992631b50da3fb07", | 249 "node": "b7ea6d14e664bdc8922221f7992631b50da3fb07", |
| 222 "shortdescription": "B1" | 250 "shortdescription": "B1" |
| 223 }, | 251 }, |
| 268 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" | 296 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" |
| 269 ], | 297 ], |
| 270 "users": [ | 298 "users": [ |
| 271 "test" | 299 "test" |
| 272 ], | 300 ], |
| 273 "verb": "folded" | 301 "verb": "rewritten" |
| 274 } | 302 } |
| 275 ], | 303 ], |
| 276 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", | 304 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
| 277 "shortdescription": "A0" | 305 "shortdescription": "A0" |
| 278 } | 306 } |
| 284 { | 312 { |
| 285 "dates": [ | 313 "dates": [ |
| 286 [ | 314 [ |
| 287 *, (glob) | 315 *, (glob) |
| 288 0 | 316 0 |
| 289 ], | 317 ] |
| 318 ], | |
| 319 "effects": [ | |
| 320 "description", | |
| 321 "content" | |
| 322 ], | |
| 323 "operations": [ | |
| 324 "fold" | |
| 325 ], | |
| 326 "prednodes": [ | |
| 327 "471f378eab4c5e25f6c77f785b27c936efb22874" | |
| 328 ], | |
| 329 "users": [ | |
| 330 "test" | |
| 331 ], | |
| 332 "verb": "rewritten" | |
| 333 }, | |
| 334 { | |
| 335 "dates": [ | |
| 290 [ | 336 [ |
| 291 *, (glob) | 337 *, (glob) |
| 292 0 | 338 0 |
| 293 ] | 339 ] |
| 294 ], | 340 ], |
| 299 ], | 345 ], |
| 300 "operations": [ | 346 "operations": [ |
| 301 "fold" | 347 "fold" |
| 302 ], | 348 ], |
| 303 "prednodes": [ | 349 "prednodes": [ |
| 304 "471f378eab4c5e25f6c77f785b27c936efb22874", | |
| 305 "b7ea6d14e664bdc8922221f7992631b50da3fb07" | 350 "b7ea6d14e664bdc8922221f7992631b50da3fb07" |
| 306 ], | 351 ], |
| 307 "users": [ | 352 "users": [ |
| 308 "test" | 353 "test" |
| 309 ], | 354 ], |
| 310 "verb": "folded" | 355 "verb": "rewritten" |
| 311 } | 356 } |
| 312 ], | 357 ], |
| 313 "node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0", | 358 "node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0", |
| 314 "shortdescription": "C0" | 359 "shortdescription": "C0" |
| 315 }, | 360 }, |