Mercurial > evolve
diff tests/test-exchange-obsmarkers-case-A1.t @ 4174:e07e764c0f48 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 12 Oct 2018 15:20:54 +0200 |
| parents | ccfcacc5ee7c ccbfbeee6cf3 |
| children | 3d917da5bd95 |
line wrap: on
line diff
--- a/tests/test-exchange-obsmarkers-case-A1.t Fri Oct 12 15:15:09 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-A1.t Fri Oct 12 15:20:54 2018 +0200 @@ -113,7 +113,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f5bc6836db60 (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -155,7 +154,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f5bc6836db60 (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -269,7 +267,6 @@ adding file changes added 2 changesets with 2 changes to 2 files 1 new obsolescence markers - new changesets f5bc6836db60:f6fbb35d8ac9 (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -311,7 +308,6 @@ adding file changes added 2 changesets with 2 changes to 2 files 1 new obsolescence markers - new changesets f5bc6836db60:f6fbb35d8ac9 (run 'hg update' to get a working copy) ## post pull state # obstore: main