Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-discard.t @ 5620:eb326644dc29
branching: merge stable into default
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 28 Oct 2020 20:24:26 +0100 |
| parents | 5907b495901e 5673730db8d5 |
| children | e5d91fd1f319 6eb9f82b43ba |
comparison
equal
deleted
inserted
replaced
| 5613:87966baf6ea9 | 5620:eb326644dc29 |
|---|---|
| 507 | 507 |
| 508 $ hg evolve -l | 508 $ hg evolve -l |
| 509 | 509 |
| 510 $ hg par | 510 $ hg par |
| 511 changeset: 5:e800202333a4 | 511 changeset: 5:e800202333a4 |
| 512 tag: tip | |
| 512 parent: 2:155349b645be | 513 parent: 2:155349b645be |
| 513 user: test | 514 user: test |
| 514 date: Thu Jan 01 00:00:00 1970 +0000 | 515 date: Thu Jan 01 00:00:00 1970 +0000 |
| 515 summary: added d | 516 summary: added d |
| 516 | 517 |
| 624 | 625 |
| 625 $ hg evolve -l | 626 $ hg evolve -l |
| 626 | 627 |
| 627 $ hg par | 628 $ hg par |
| 628 changeset: 5:e800202333a4 | 629 changeset: 5:e800202333a4 |
| 630 tag: tip | |
| 629 parent: 2:155349b645be | 631 parent: 2:155349b645be |
| 630 user: test | 632 user: test |
| 631 date: Thu Jan 01 00:00:00 1970 +0000 | 633 date: Thu Jan 01 00:00:00 1970 +0000 |
| 632 summary: added d | 634 summary: added d |
| 633 | 635 |