Mercurial > evolve
diff tests/test-exchange-obsmarkers-case-A6.t @ 2798:2280461343e5 mercurial-4.2
test-compat: merge mercurial-4.2 with the new stable branch content
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 25 Jul 2017 03:41:15 +0200 |
| parents | 21f06d932231 |
| children | 67b59d1657cf |
line wrap: on
line diff
--- a/tests/test-exchange-obsmarkers-case-A6.t Tue Jul 25 05:52:14 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-A6.t Tue Jul 25 03:41:15 2017 +0200 @@ -64,7 +64,6 @@ create a marker after this $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - obsoleted 1 changesets $ hg log -G --hidden @ e5ea8f9c7314 (draft): A1 | @@ -109,7 +108,6 @@ searching for changes no changes found remote: 1 new obsolescence markers - remote: obsoleted 1 changesets ## post push state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} @@ -120,7 +118,6 @@ pulling from main no changes found 1 new obsolescence markers - obsoleted 1 changesets ## post pull state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} @@ -144,7 +141,6 @@ searching for changes no changes found remote: 1 new obsolescence markers - remote: obsoleted 1 changesets ## post push state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} @@ -156,7 +152,6 @@ searching for changes no changes found 1 new obsolescence markers - obsoleted 1 changesets ## post pull state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}