Mercurial > evolve
diff tests/test-evolve-issue5958.t @ 5091:308c1e09f80f mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 23 Jan 2020 17:40:59 +0700 |
| parents | 88b816a9d990 |
| children |
line wrap: on
line diff
--- a/tests/test-evolve-issue5958.t Thu Jan 23 17:40:57 2020 +0700 +++ b/tests/test-evolve-issue5958.t Thu Jan 23 17:40:59 2020 +0700 @@ -108,9 +108,9 @@ atop:[0] add r0 working directory is now at 545776b4e79f $ hg update --hidden --rev 'predecessors(.)' + updating to a hidden changeset 459c64f7eaad + (hidden revision '459c64f7eaad' was rewritten as: 545776b4e79f) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 459c64f7eaad - (hidden revision '459c64f7eaad' was rewritten as: 545776b4e79f) working directory parent is obsolete! (459c64f7eaad) (use 'hg evolve' to update to its successor: 545776b4e79f) $ hg amend --date "0 3" @@ -159,9 +159,9 @@ date: updated one side to an newer value $ hg update --hidden --rev 'predecessors(.)' + updating to a hidden changeset 7a09c7a39546 + (hidden revision '7a09c7a39546' was rewritten as: 39c4200c0d94) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 7a09c7a39546 - (hidden revision '7a09c7a39546' was rewritten as: 39c4200c0d94) working directory parent is obsolete! (7a09c7a39546) (use 'hg evolve' to update to its successor: 39c4200c0d94) $ hg amend --date "120 0" @@ -210,9 +210,9 @@ $ hg amend --date "235 0" $ hg update --hidden --rev 'predecessors(.)' + updating to a hidden changeset 06cde6010a51 + (hidden revision '06cde6010a51' was rewritten as: a7412ff9bfb3) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 06cde6010a51 - (hidden revision '06cde6010a51' was rewritten as: a7412ff9bfb3) working directory parent is obsolete! (06cde6010a51) (use 'hg evolve' to update to its successor: a7412ff9bfb3) $ hg amend --date "784 0"