Mercurial > hg
comparison tests/test-histedit-obsolete.t @ 27405:5837ca674da9
histedit: omit useless message from update (histeditaction)
specifically:
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Mon, 14 Dec 2015 21:43:16 +0000 |
| parents | 88fde8db5307 |
| children | 11be6b7f95da |
comparison
equal
deleted
inserted
replaced
| 27404:1cf3543cc780 | 27405:5837ca674da9 |
|---|---|
| 198 > pick 40db8afa467b 10 c | 198 > pick 40db8afa467b 10 c |
| 199 > drop 1b3b05f35ff0 13 h | 199 > drop 1b3b05f35ff0 13 h |
| 200 > EOF | 200 > EOF |
| 201 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | 201 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
| 202 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 202 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 203 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 204 $ hg log -G | 203 $ hg log -G |
| 205 @ 17:ee6544123ab8 c | 204 @ 17:ee6544123ab8 c |
| 206 | | 205 | |
| 207 o 16:269e713e9eae g | 206 o 16:269e713e9eae g |
| 208 | | 207 | |
| 290 When you are finished, run hg histedit --continue to resume. | 289 When you are finished, run hg histedit --continue to resume. |
| 291 [1] | 290 [1] |
| 292 $ echo f >> f | 291 $ echo f >> f |
| 293 $ hg histedit --continue | 292 $ hg histedit --continue |
| 294 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 293 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 295 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 296 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 297 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 298 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 299 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 300 $ hg log -G | 294 $ hg log -G |
| 301 @ 24:12925f763c90 (secret) k | 295 @ 24:12925f763c90 (secret) k |
| 302 | | 296 | |
| 303 o 23:4545a6e77442 (secret) j | 297 o 23:4545a6e77442 (secret) j |
| 304 | | 298 | |
| 338 Make changes as needed, you may commit or record as needed now. | 332 Make changes as needed, you may commit or record as needed now. |
| 339 When you are finished, run hg histedit --continue to resume. | 333 When you are finished, run hg histedit --continue to resume. |
| 340 [1] | 334 [1] |
| 341 $ echo f >> f | 335 $ echo f >> f |
| 342 $ hg histedit --continue | 336 $ hg histedit --continue |
| 343 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 344 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 345 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 346 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 347 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 348 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 337 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 349 $ hg log -G | 338 $ hg log -G |
| 350 @ 24:12925f763c90 (secret) k | 339 @ 24:12925f763c90 (secret) k |
| 351 | | 340 | |
| 352 o 23:4545a6e77442 (secret) j | 341 o 23:4545a6e77442 (secret) j |
| 382 > pick ee4a24fc4dfa 13 h | 371 > pick ee4a24fc4dfa 13 h |
| 383 > pick 14bda137d5b3 16 k | 372 > pick 14bda137d5b3 16 k |
| 384 > EOF | 373 > EOF |
| 385 0 files updated, 0 files merged, 5 files removed, 0 files unresolved | 374 0 files updated, 0 files merged, 5 files removed, 0 files unresolved |
| 386 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 375 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 387 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 388 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 389 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 390 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 391 $ hg log -G | 376 $ hg log -G |
| 392 @ 23:9e712162b2c1 (secret) k | 377 @ 23:9e712162b2c1 (secret) k |
| 393 | | 378 | |
| 394 o 22:490861543602 (secret) h | 379 o 22:490861543602 (secret) h |
| 395 | | 380 | |
| 428 > fold c62e7241a4f2 15 j | 413 > fold c62e7241a4f2 15 j |
| 429 > pick 9cd3934e05af 14 i | 414 > pick 9cd3934e05af 14 i |
| 430 > fold 14bda137d5b3 16 k | 415 > fold 14bda137d5b3 16 k |
| 431 > EOF | 416 > EOF |
| 432 0 files updated, 0 files merged, 6 files removed, 0 files unresolved | 417 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
| 433 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 434 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 418 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 435 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 419 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 436 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 437 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 438 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 420 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 439 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 421 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 440 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 441 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 442 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 422 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 443 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 423 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 444 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 424 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 445 $ hg log -G | 425 $ hg log -G |
| 446 @ 27:769e8ee8708e (secret) i | 426 @ 27:769e8ee8708e (secret) i |