Mercurial > evolve
diff tests/test-evolve-public-content-divergent.t @ 4454:f530850c8184
evolve: drop the "computing new diff message" for phase-divergence
Future code update will remove this message, dropping it early clarify the
future diff.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 26 Mar 2019 12:30:10 +0100 |
| parents | ea336a6592cc |
| children | 3caa4a459439 |
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent.t Wed Mar 20 09:19:02 2019 -0700 +++ b/tests/test-evolve-public-content-divergent.t Tue Mar 26 12:30:10 2019 +0100 @@ -70,7 +70,6 @@ merging "other" content-divergent changeset 'dcdaf152280a' merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - computing new diff committed as c1aa9cfb6cf8 working directory is now at c1aa9cfb6cf8 @@ -177,7 +176,6 @@ (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue - computing new diff committed as 1a739394e9d4 working directory is now at 1a739394e9d4 @@ -312,7 +310,6 @@ updating to "local" side of the conflict: c0d7ee6604ea merging "other" content-divergent changeset 'c3d442d80993' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - computing new diff committed as 3b336cbee992 working directory is now at 3b336cbee992 @@ -446,7 +443,6 @@ updating to "local" side of the conflict: 93cd84bbdaca merging "other" content-divergent changeset 'f88581407163' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - computing new diff committed as 4cbe48a0c3d9 working directory is now at 4cbe48a0c3d9 @@ -563,7 +559,6 @@ updating to "local" side of the conflict: 93cd84bbdaca merging "other" content-divergent changeset '2af3359250d3' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - computing new diff committed as 06e4564a3897 working directory is now at 06e4564a3897 @@ -657,7 +652,6 @@ continue: hg evolve --continue $ hg evolve --continue - computing new diff committed as 2a0f44767904 working directory is now at 2a0f44767904 @@ -786,7 +780,6 @@ continue: hg evolve --continue $ hg evolve --continue - computing new diff committed as b9082a9e66ce working directory is now at b9082a9e66ce