Mercurial > evolve
changeset 5729:3a1e07c27e4a
divergence-resolution: remove explicite hash in some command
This make them more robust to hash change.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 22 Jan 2021 04:54:51 +0100 |
| parents | 6dbfd71cdcba |
| children | a119432bafc1 |
| files | tests/test-evolve-content-divergent-interrupted.t |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-interrupted.t Fri Jan 22 04:24:05 2021 +0100 +++ b/tests/test-evolve-content-divergent-interrupted.t Fri Jan 22 04:54:51 2021 +0100 @@ -279,7 +279,7 @@ $ hg add c $ hg amend - $ hg up --hidden c41c793e0ef1 + $ hg up --hidden 'min(desc("added d"))' 2 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to hidden changeset c41c793e0ef1 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) @@ -336,7 +336,7 @@ is parent of one of the divergents and merging divergent leads to conflicts --------------------------------------------------------------------------------- - $ hg up 69bdd23a9b0d + $ hg up 'min(desc("added d"))' 2 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rm c $ echo wat > d @@ -423,7 +423,7 @@ $ echo bar > d $ hg amend - $ hg up c41c793e0ef1 --hidden + $ hg up 'min(desc("added d"))' --hidden 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to hidden changeset c41c793e0ef1 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)