Mercurial > evolve
comparison tests/test-exchange-B4.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 | f355bbc124fc |
comparison
equal
deleted
inserted
replaced
1039:657a38cd2ae3 | 1040:640f3280559e |
---|---|
102 ## pulling "a9bdc8b26820" from main into pulldest | 102 ## pulling "a9bdc8b26820" from main into pulldest |
103 pulling from main | 103 pulling from main |
104 no changes found | 104 no changes found |
105 OBSEXC: pull obsolescence markers | 105 OBSEXC: pull obsolescence markers |
106 OBSEXC: merging obsolescence markers (89 bytes) | 106 OBSEXC: merging obsolescence markers (89 bytes) |
107 OBSEXC: 1 markers added | 107 OBSEXC: 1 obsolescence markers added |
108 OBSEXC: DONE | 108 OBSEXC: DONE |
109 ## post pull state | 109 ## post pull state |
110 # obstore: main | 110 # obstore: main |
111 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} | 111 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
112 # obstore: pushdest | 112 # obstore: pushdest |
142 pulling from main | 142 pulling from main |
143 searching for changes | 143 searching for changes |
144 no changes found | 144 no changes found |
145 OBSEXC: pull obsolescence markers | 145 OBSEXC: pull obsolescence markers |
146 OBSEXC: merging obsolescence markers (89 bytes) | 146 OBSEXC: merging obsolescence markers (89 bytes) |
147 OBSEXC: 1 markers added | 147 OBSEXC: 1 obsolescence markers added |
148 OBSEXC: DONE | 148 OBSEXC: DONE |
149 ## post pull state | 149 ## post pull state |
150 # obstore: main | 150 # obstore: main |
151 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} | 151 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} |
152 # obstore: pushdest | 152 # obstore: pushdest |