Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-D3.t @ 2594:a3fbe5293bf6 stable
merge with stable
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 16 Jun 2017 11:32:21 +0200 |
| parents | 51a1dd295fe0 |
| children | 21f06d932231 |
comparison
equal
deleted
inserted
replaced
| 2557:e3acb8823900 | 2594:a3fbe5293bf6 |
|---|---|
| 59 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | 59 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
| 60 $ hg prune -d '0 0' . | 60 $ hg prune -d '0 0' . |
| 61 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 61 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 62 working directory now at 35b183996678 | 62 working directory now at 35b183996678 |
| 63 1 changesets pruned | 63 1 changesets pruned |
| 64 $ hg strip --hidden -q 'desc(A1)' | 64 $ hg strip --hidden -q 'desc(A1)' --config devel.strip-obsmarkers=no |
| 65 $ hg log -G --hidden | 65 $ hg log -G --hidden |
| 66 @ 35b183996678 (draft): B | 66 @ 35b183996678 (draft): B |
| 67 | | 67 | |
| 68 | x 28b51eb45704 (draft): A0 | 68 | x 28b51eb45704 (draft): A0 |
| 69 |/ | 69 |/ |
| 70 o a9bdc8b26820 (public): O | 70 o a9bdc8b26820 (public): O |
| 71 | 71 |
| 72 $ inspect_obsmarkers | 72 $ inspect_obsmarkers |
| 73 obsstore content | 73 obsstore content |
| 74 ================ | 74 ================ |
| 75 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 75 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (*) {'user': 'test'} (glob) |
| 76 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 76 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob) |
| 77 obshashtree | 77 obshashtree |
| 78 =========== | 78 =========== |
| 79 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 | 79 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
| 80 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 | 80 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 |
| 81 35b1839966785d5703a01607229eea932db42f87 65a9f21dff0702355e973a8f31d3b3b7e59376fb | 81 35b1839966785d5703a01607229eea932db42f87 43ff2c20d850ad18dee0f7f252c98c1f1a0cfd5c |
| 82 obshashrange | 82 obshashrange |
| 83 ============ | 83 ============ |
| 84 rev node index size depth obshash | 84 rev node index size depth obshash |
| 85 2 35b183996678 0 2 2 65a9f21dff07 | 85 2 35b183996678 0 2 2 43ff2c20d850 |
| 86 2 35b183996678 1 1 2 65a9f21dff07 | 86 2 35b183996678 1 1 2 43ff2c20d850 |
| 87 0 a9bdc8b26820 0 1 1 000000000000 | 87 0 a9bdc8b26820 0 1 1 000000000000 |
| 88 $ cd .. | 88 $ cd .. |
| 89 $ cd .. | 89 $ cd .. |
| 90 | 90 |
| 91 Actual Test | 91 Actual Test |
| 94 $ dotest D.3 O | 94 $ dotest D.3 O |
| 95 ## Running testcase D.3 | 95 ## Running testcase D.3 |
| 96 # testing echange of "O" (a9bdc8b26820) | 96 # testing echange of "O" (a9bdc8b26820) |
| 97 ## initial state | 97 ## initial state |
| 98 # obstore: main | 98 # obstore: main |
| 99 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 99 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (*) {'user': 'test'} (glob) |
| 100 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 100 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob) |
| 101 # obstore: pushdest | 101 # obstore: pushdest |
| 102 # obstore: pulldest | 102 # obstore: pulldest |
| 103 ## pushing "O" from main to pushdest | 103 ## pushing "O" from main to pushdest |
| 104 pushing to pushdest | 104 pushing to pushdest |
| 105 searching for changes | 105 searching for changes |
| 106 no changes found | 106 no changes found |
| 107 ## post push state | 107 ## post push state |
| 108 # obstore: main | 108 # obstore: main |
| 109 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 109 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (*) {'user': 'test'} (glob) |
| 110 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 110 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob) |
| 111 # obstore: pushdest | 111 # obstore: pushdest |
| 112 # obstore: pulldest | 112 # obstore: pulldest |
| 113 ## pulling "a9bdc8b26820" from main into pulldest | 113 ## pulling "a9bdc8b26820" from main into pulldest |
| 114 pulling from main | 114 pulling from main |
| 115 no changes found | 115 no changes found |
| 116 ## post pull state | 116 ## post pull state |
| 117 # obstore: main | 117 # obstore: main |
| 118 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 118 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (*) {'user': 'test'} (glob) |
| 119 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 119 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob) |
| 120 # obstore: pushdest | 120 # obstore: pushdest |
| 121 # obstore: pulldest | 121 # obstore: pulldest |
| 122 | 122 |