Mercurial > evolve
diff tests/test-exchange-A1.t @ 1040:640f3280559e
evolve: add "obsolescence" in front of marked in the previous message
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 08 Aug 2014 17:49:22 -0700 |
parents | bddee73b361e |
children | f6e0cfca1bf0 |
line wrap: on
line diff
--- a/tests/test-exchange-A1.t Fri Aug 08 17:46:20 2014 -0700 +++ b/tests/test-exchange-A1.t Fri Aug 08 17:49:22 2014 -0700 @@ -91,7 +91,7 @@ added 1 changesets with 1 changes to 1 files OBSEXC: pull obsolescence markers OBSEXC: merging obsolescence markers (62 bytes) - OBSEXC: 1 markers added + OBSEXC: 1 obsolescence markers added OBSEXC: DONE (run 'hg update' to get a working copy) ## post pull state @@ -141,7 +141,7 @@ added 1 changesets with 1 changes to 1 files OBSEXC: pull obsolescence markers OBSEXC: merging obsolescence markers (62 bytes) - OBSEXC: 1 markers added + OBSEXC: 1 obsolescence markers added OBSEXC: DONE (run 'hg update' to get a working copy) ## post pull state @@ -250,7 +250,7 @@ added 2 changesets with 2 changes to 2 files OBSEXC: pull obsolescence markers OBSEXC: merging obsolescence markers (62 bytes) - OBSEXC: 1 markers added + OBSEXC: 1 obsolescence markers added OBSEXC: DONE (run 'hg update' to get a working copy) ## post pull state @@ -297,7 +297,7 @@ added 2 changesets with 2 changes to 2 files OBSEXC: pull obsolescence markers OBSEXC: merging obsolescence markers (62 bytes) - OBSEXC: 1 markers added + OBSEXC: 1 obsolescence markers added OBSEXC: DONE (run 'hg update' to get a working copy) ## post pull state