70 created new head |
70 created new head |
71 $ mkcommit B1 |
71 $ mkcommit B1 |
72 $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` |
72 $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` |
73 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` |
73 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` |
74 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` |
74 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` |
75 $ hg prune -qd '0 0' 'desc(B1)' |
75 $ hg prune -qd '0 0' 'desc(B1)' |
76 $ hg log -G --hidden |
76 $ hg log -G --hidden |
77 x 069b05c3876d (draft): B1 |
77 x 069b05c3876d (draft): B1 |
78 | |
78 | |
79 @ e5ea8f9c7314 (draft): A1 |
79 @ e5ea8f9c7314 (draft): A1 |
80 | |
80 | |
87 o a9bdc8b26820 (public): O |
87 o a9bdc8b26820 (public): O |
88 |
88 |
89 $ inspect_obsmarkers |
89 $ inspect_obsmarkers |
90 obsstore content |
90 obsstore content |
91 ================ |
91 ================ |
92 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
92 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
93 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
93 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |
94 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
94 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob) |
95 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
95 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'ef1': '*', 'user': 'test'} (glob) |
96 obshashtree |
96 obshashtree |
97 =========== |
97 =========== |
98 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
98 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
99 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 |
99 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 |
100 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 13bd00d88332fcd3fe634ed42f9d35c9cfc06398 |
100 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 13bd00d88332fcd3fe634ed42f9d35c9cfc06398 |
101 1d0f3cd253006f014c7687a78abbc9287db4101d 01d985a82467333a4de7a5b4e8a0de3286f8bda8 |
101 1d0f3cd253006f014c7687a78abbc9287db4101d 01d985a82467333a4de7a5b4e8a0de3286f8bda8 |
102 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 d2b1159bcf3694aabc3674785b1859544c35357d |
102 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 13bd4798a9a787c0b54db36e03ec580012600b50 |
103 069b05c3876d56f62895e853a501ea58ea85f68d a07163ee7e7cda4065f7593715b7b12f833f7065 |
103 069b05c3876d56f62895e853a501ea58ea85f68d 35916a1d760564c67d3a68921fd5908f28b486c0 |
104 obshashrange |
104 obshashrange |
105 ============ |
105 ============ |
106 rev node index size depth obshash |
106 rev node index size depth obshash |
107 3 1d0f3cd25300 0 4 4 000000000000 |
107 3 1d0f3cd25300 0 4 4 000000000000 |
108 3 1d0f3cd25300 2 2 4 000000000000 |
108 3 1d0f3cd25300 2 2 4 000000000000 |
109 1 28b51eb45704 0 2 2 000000000000 |
109 1 28b51eb45704 0 2 2 000000000000 |
110 4 e5ea8f9c7314 0 2 2 d2b1159bcf36 |
110 4 e5ea8f9c7314 0 2 2 13bd4798a9a7 |
111 3 1d0f3cd25300 3 1 4 000000000000 |
111 3 1d0f3cd25300 3 1 4 000000000000 |
112 1 28b51eb45704 1 1 2 000000000000 |
112 1 28b51eb45704 1 1 2 000000000000 |
113 2 6e72f0a95b5e 2 1 3 13bd00d88332 |
113 2 6e72f0a95b5e 2 1 3 13bd00d88332 |
114 0 a9bdc8b26820 0 1 1 000000000000 |
114 0 a9bdc8b26820 0 1 1 000000000000 |
115 4 e5ea8f9c7314 1 1 2 d2b1159bcf36 |
115 4 e5ea8f9c7314 1 1 2 13bd4798a9a7 |
116 $ cd .. |
116 $ cd .. |
117 $ cd .. |
117 $ cd .. |
118 |
118 |
119 Actual Test (explicit push version) |
119 Actual Test (explicit push version) |
120 ----------------------------------- |
120 ----------------------------------- |
122 $ dotest B.5 C -f |
122 $ dotest B.5 C -f |
123 ## Running testcase B.5 |
123 ## Running testcase B.5 |
124 # testing echange of "C" (1d0f3cd25300) |
124 # testing echange of "C" (1d0f3cd25300) |
125 ## initial state |
125 ## initial state |
126 # obstore: main |
126 # obstore: main |
127 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
127 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'ef1': '*', 'user': 'test'} (glob) |
128 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
128 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
129 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
129 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob) |
130 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
130 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |
131 # obstore: pushdest |
131 # obstore: pushdest |
132 # obstore: pulldest |
132 # obstore: pulldest |
133 ## pushing "C" from main to pushdest |
133 ## pushing "C" from main to pushdest |
134 pushing to pushdest |
134 pushing to pushdest |
135 searching for changes |
135 searching for changes |
138 remote: adding file changes |
138 remote: adding file changes |
139 remote: added 3 changesets with 3 changes to 3 files |
139 remote: added 3 changesets with 3 changes to 3 files |
140 remote: 1 new obsolescence markers |
140 remote: 1 new obsolescence markers |
141 ## post push state |
141 ## post push state |
142 # obstore: main |
142 # obstore: main |
143 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
143 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'ef1': '*', 'user': 'test'} (glob) |
144 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
144 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
145 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
145 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob) |
146 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
146 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |
147 # obstore: pushdest |
147 # obstore: pushdest |
148 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
148 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |
149 # obstore: pulldest |
149 # obstore: pulldest |
150 ## pulling "1d0f3cd25300" from main into pulldest |
150 ## pulling "1d0f3cd25300" from main into pulldest |
151 pulling from main |
151 pulling from main |
152 searching for changes |
152 searching for changes |
153 adding changesets |
153 adding changesets |
156 added 3 changesets with 3 changes to 3 files |
156 added 3 changesets with 3 changes to 3 files |
157 1 new obsolescence markers |
157 1 new obsolescence markers |
158 (run 'hg update' to get a working copy) |
158 (run 'hg update' to get a working copy) |
159 ## post pull state |
159 ## post pull state |
160 # obstore: main |
160 # obstore: main |
161 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
161 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'ef1': '*', 'user': 'test'} (glob) |
162 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
162 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob) |
163 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
163 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (*) {'user': 'test'} (glob) |
164 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
164 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |
165 # obstore: pushdest |
165 # obstore: pushdest |
166 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
166 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |
167 # obstore: pulldest |
167 # obstore: pulldest |
168 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
168 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |