Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-B3.t @ 3592:7a5c3175015e mercurial-4.2
test-compat: merge mercurial-4.3 into mercurial-4.2
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 21 Mar 2018 16:32:54 +0100 |
parents | 98941c28f3e2 |
children |
comparison
equal
deleted
inserted
replaced
3591:98941c28f3e2 | 3592:7a5c3175015e |
---|---|
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 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 75 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob) |
76 obshashtree | 76 obshashtree |
77 =========== | 77 =========== |
78 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 | 78 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
79 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0000000000000000000000000000000000000000 | 79 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0000000000000000000000000000000000000000 |
80 35b1839966785d5703a01607229eea932db42f87 631ab4cd02ffa1d144dc8f32a18be574076031e3 | 80 35b1839966785d5703a01607229eea932db42f87 d6033d6b3eb3451694dde5b6dd2356ae57eff23b |
81 e56289ab6378dc752fd7965f8bf66b58bda740bd a37fa02ad96f2e8ecce7080e73cfe22af8e1b14f | 81 e56289ab6378dc752fd7965f8bf66b58bda740bd f4bc7329023b9b1f7db3b7989fd7f80a2ca7a008 |
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 631ab4cd02ff | 85 2 35b183996678 0 2 2 d6033d6b3eb3 |
86 1 f5bc6836db60 0 2 2 000000000000 | 86 1 f5bc6836db60 0 2 2 000000000000 |
87 2 35b183996678 1 1 2 631ab4cd02ff | 87 2 35b183996678 1 1 2 d6033d6b3eb3 |
88 0 a9bdc8b26820 0 1 1 000000000000 | 88 0 a9bdc8b26820 0 1 1 000000000000 |
89 1 f5bc6836db60 1 1 2 000000000000 | 89 1 f5bc6836db60 1 1 2 000000000000 |
90 $ cd .. | 90 $ cd .. |
91 $ cd .. | 91 $ cd .. |
92 | 92 |
96 $ dotest B.3 A | 96 $ dotest B.3 A |
97 ## Running testcase B.3 | 97 ## Running testcase B.3 |
98 # testing echange of "A" (f5bc6836db60) | 98 # testing echange of "A" (f5bc6836db60) |
99 ## initial state | 99 ## initial state |
100 # obstore: main | 100 # obstore: main |
101 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 101 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob) |
102 # obstore: pushdest | 102 # obstore: pushdest |
103 # obstore: pulldest | 103 # obstore: pulldest |
104 ## pushing "A" from main to pushdest | 104 ## pushing "A" from main to pushdest |
105 pushing to pushdest | 105 pushing to pushdest |
106 searching for changes | 106 searching for changes |
108 remote: adding manifests | 108 remote: adding manifests |
109 remote: adding file changes | 109 remote: adding file changes |
110 remote: added 1 changesets with 1 changes to 1 files | 110 remote: added 1 changesets with 1 changes to 1 files |
111 ## post push state | 111 ## post push state |
112 # obstore: main | 112 # obstore: main |
113 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 113 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob) |
114 # obstore: pushdest | 114 # obstore: pushdest |
115 # obstore: pulldest | 115 # obstore: pulldest |
116 ## pulling "f5bc6836db60" from main into pulldest | 116 ## pulling "f5bc6836db60" from main into pulldest |
117 pulling from main | 117 pulling from main |
118 searching for changes | 118 searching for changes |
121 adding file changes | 121 adding file changes |
122 added 1 changesets with 1 changes to 1 files | 122 added 1 changesets with 1 changes to 1 files |
123 (run 'hg update' to get a working copy) | 123 (run 'hg update' to get a working copy) |
124 ## post pull state | 124 ## post pull state |
125 # obstore: main | 125 # obstore: main |
126 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 126 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (*) {'ef1': '*', 'user': 'test'} (glob) |
127 # obstore: pushdest | 127 # obstore: pushdest |
128 # obstore: pulldest | 128 # obstore: pulldest |
129 | 129 |