Mercurial > evolve
diff tests/test-evolve-public-content-divergent-discard.t @ 5722:61d2f1cf90f0
branching: merge stable into default
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 22 Jan 2021 11:04:55 +0100 |
| parents | e5d91fd1f319 b3d9e6c805d6 |
| children | 8e4f6354b316 b0b1ab64f6d8 |
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-discard.t Thu Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-public-content-divergent-discard.t Fri Jan 22 11:04:55 2021 +0100 @@ -293,7 +293,6 @@ $ hg evolve --continue other divergent changeset 229da2719b19 has same content as local f7c1071f1e7c and differs by "description" only, discarding 229da2719b19 - working directory is now at f7c1071f1e7c $ hg evolve -l @@ -399,7 +398,6 @@ evolving 4:f89a8e2f86ac "added dh" 0 files updated, 0 files merged, 0 files removed, 0 files unresolved other divergent changeset bc309da55b88 has same content as local e800202333a4 and differs by "description" only, discarding bc309da55b88 - working directory is now at e800202333a4 $ hg evolve -l @@ -503,7 +501,6 @@ $ hg evolve --continue other divergent changeset a5bbf2042450 has same content as local e800202333a4 and differs by "description" only, discarding a5bbf2042450 - working directory is now at e800202333a4 $ hg evolve -l @@ -621,7 +618,6 @@ $ hg evolve --continue other divergent changeset 09054d1f3c97 has same content as local e800202333a4 and differs by "description" only, discarding 09054d1f3c97 - working directory is now at e800202333a4 $ hg evolve -l