Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-corner-cases.t @ 4576:96ce1030d2fb
tests: add --update to hg evolve to reduce test changes for the next patch
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 14 Apr 2019 02:18:19 +0800 |
| parents | d081cc4f5fef |
| children | 4fcf9a71befc |
comparison
equal
deleted
inserted
replaced
| 4575:903e8b983fac | 4576:96ce1030d2fb |
|---|---|
| 382 | 382 |
| 383 rewritten(description, parent, content) as e568fd1029bb using prune by test (Thu Jan 01 00:00:00 1970 +0000) | 383 rewritten(description, parent, content) as e568fd1029bb using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
| 384 (No patch available, changesets rebased) | 384 (No patch available, changesets rebased) |
| 385 | 385 |
| 386 | 386 |
| 387 $ hg evolve --content-divergent --any | 387 $ hg evolve --content-divergent --any --update |
| 388 merge:[5] added d | 388 merge:[5] added d |
| 389 with: [4] added c e | 389 with: [4] added c e |
| 390 base: [3] added d | 390 base: [3] added d |
| 391 rebasing "other" content-divergent changeset e568fd1029bb on 155349b645be | 391 rebasing "other" content-divergent changeset e568fd1029bb on 155349b645be |
| 392 merging c | 392 merging c |