Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-D3.t @ 3566:e6bea259c227
prune: include "operation" metadata in obsmarkers
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 12 Mar 2018 15:51:17 -0700 |
| parents | d166b3dc5e8a |
| children | 98941c28f3e2 30a544904238 |
comparison
equal
deleted
inserted
replaced
| 3565:cfe31185ad07 | 3566:e6bea259c227 |
|---|---|
| 72 | 72 |
| 73 $ inspect_obsmarkers | 73 $ inspect_obsmarkers |
| 74 obsstore content | 74 obsstore content |
| 75 ================ | 75 ================ |
| 76 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 76 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 77 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} | 77 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
| 78 obshashtree | 78 obshashtree |
| 79 =========== | 79 =========== |
| 80 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 | 80 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
| 81 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 | 81 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 |
| 82 35b1839966785d5703a01607229eea932db42f87 43ff2c20d850ad18dee0f7f252c98c1f1a0cfd5c | 82 35b1839966785d5703a01607229eea932db42f87 d864ed12a58243aaedc35c1d065dba31aa787d4c |
| 83 obshashrange | 83 obshashrange |
| 84 ============ | 84 ============ |
| 85 rev node index size depth obshash | 85 rev node index size depth obshash |
| 86 2 35b183996678 0 2 2 43ff2c20d850 | 86 2 35b183996678 0 2 2 d864ed12a582 |
| 87 2 35b183996678 1 1 2 43ff2c20d850 | 87 2 35b183996678 1 1 2 d864ed12a582 |
| 88 0 a9bdc8b26820 0 1 1 000000000000 | 88 0 a9bdc8b26820 0 1 1 000000000000 |
| 89 $ cd .. | 89 $ cd .. |
| 90 $ cd .. | 90 $ cd .. |
| 91 | 91 |
| 92 Actual Test | 92 Actual Test |
| 96 ## Running testcase D.3 | 96 ## Running testcase D.3 |
| 97 # testing echange of "O" (a9bdc8b26820) | 97 # testing echange of "O" (a9bdc8b26820) |
| 98 ## initial state | 98 ## initial state |
| 99 # obstore: main | 99 # obstore: main |
| 100 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 100 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 101 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} | 101 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
| 102 # obstore: pushdest | 102 # obstore: pushdest |
| 103 # obstore: pulldest | 103 # obstore: pulldest |
| 104 ## pushing "O" from main to pushdest | 104 ## pushing "O" from main to pushdest |
| 105 pushing to pushdest | 105 pushing to pushdest |
| 106 searching for changes | 106 searching for changes |
| 107 no changes found | 107 no changes found |
| 108 ## post push state | 108 ## post push state |
| 109 # obstore: main | 109 # obstore: main |
| 110 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 110 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 111 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} | 111 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
| 112 # obstore: pushdest | 112 # obstore: pushdest |
| 113 # obstore: pulldest | 113 # obstore: pulldest |
| 114 ## pulling "a9bdc8b26820" from main into pulldest | 114 ## pulling "a9bdc8b26820" from main into pulldest |
| 115 pulling from main | 115 pulling from main |
| 116 no changes found | 116 no changes found |
| 117 ## post pull state | 117 ## post pull state |
| 118 # obstore: main | 118 # obstore: main |
| 119 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 119 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 120 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} | 120 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
| 121 # obstore: pushdest | 121 # obstore: pushdest |
| 122 # obstore: pulldest | 122 # obstore: pulldest |
| 123 | 123 |