1 |
|
2 |
|
3 Initial setup |
|
4 |
|
5 $ . $TESTDIR/testlib/exchange-util.sh |
|
6 |
|
7 |
|
8 === C.3 Pruned changeset on precursors of another pruned one === |
|
9 |
|
10 .. {{{ |
|
11 .. B ⊗ |
|
12 .. | |
|
13 .. A ø⇠⊗ A' |
|
14 .. |/ |
|
15 .. ● O |
|
16 .. }}} |
|
17 .. |
|
18 .. Marker exist from: |
|
19 .. |
|
20 .. * A' succeed to A |
|
21 .. * A' (prune |
|
22 .. * B (prune) |
|
23 .. |
|
24 .. Command run: |
|
25 .. |
|
26 .. * hg push -r A' |
|
27 .. * hg push |
|
28 .. |
|
29 .. Expected exchange: |
|
30 .. |
|
31 .. * `A ø⇠⊗ A'` |
|
32 .. * A (prune) |
|
33 .. * B (prune) |
|
34 |
|
35 $ setuprepos C.3 |
|
36 creating test repo for test case C.3 |
|
37 - pulldest |
|
38 - main |
|
39 - pushdest |
|
40 cd into `main` and proceed with env setup |
|
41 $ cd main |
|
42 $ mkcommit A0 |
|
43 $ mkcommit B |
|
44 $ hg prune -qd '0 0' . |
|
45 $ hg update -q 0 |
|
46 $ mkcommit A1 |
|
47 created new head |
|
48 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
49 $ hg prune -qd '0 0' . |
|
50 $ hg log -G --hidden |
|
51 x e5ea8f9c7314 (draft): A1 |
|
52 | |
|
53 | x 06055a7959d4 (draft): B |
|
54 | | |
|
55 | x 28b51eb45704 (draft): A0 |
|
56 |/ |
|
57 @ a9bdc8b26820 (public): O |
|
58 |
|
59 $ hg debugobsolete |
|
60 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
61 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
62 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
63 $ hg debugobsrelsethashtree |
|
64 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 40be80b35671116f2c61ef25797806536a6eb5a0 |
|
65 28b51eb45704506b5c603decd6bf7ac5e0f6a52f beac7228bbe708bc7c9181c3c27f8a17f21dbd9f |
|
66 06055a7959d4128e6e3bccfd01482e83a2db8a3a 8b648bd67281e9e525919285ac7b3bb2836c2f02 |
|
67 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 dcd2b566ad0983333be704afdc205066e1a6b742 |
|
68 $ hg debugobshashrange --subranges --rev 'head()' |
|
69 rev node index size depth obshash |
|
70 0 a9bdc8b26820 0 1 1 40be80b35671 |
|
71 $ cd .. |
|
72 $ cd .. |
|
73 |
|
74 $ cp -r C.3 C.3.a |
|
75 $ cp -r C.3 C.3.b |
|
76 |
|
77 Actual Test (explicit push) |
|
78 --------------------------- |
|
79 |
|
80 $ dotest C.3.a O |
|
81 ## Running testcase C.3.a |
|
82 # testing echange of "O" (a9bdc8b26820) |
|
83 ## initial state |
|
84 # obstore: main |
|
85 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
86 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
87 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
88 # obstore: pushdest |
|
89 # obstore: pulldest |
|
90 ## pushing "O" from main to pushdest |
|
91 pushing to pushdest |
|
92 searching for changes |
|
93 no changes found |
|
94 remote: 3 new obsolescence markers |
|
95 ## post push state |
|
96 # obstore: main |
|
97 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
98 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
99 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
100 # obstore: pushdest |
|
101 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
102 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
103 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
104 # obstore: pulldest |
|
105 ## pulling "a9bdc8b26820" from main into pulldest |
|
106 pulling from main |
|
107 no changes found |
|
108 3 new obsolescence markers |
|
109 ## post pull state |
|
110 # obstore: main |
|
111 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
112 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
113 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
114 # obstore: pushdest |
|
115 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
116 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
117 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
118 # obstore: pulldest |
|
119 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
120 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
121 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
122 |
|
123 Actual Test (bare push) |
|
124 ------------------------------------- |
|
125 |
|
126 $ dotest C.3.b |
|
127 ## Running testcase C.3.b |
|
128 ## initial state |
|
129 # obstore: main |
|
130 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
131 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
132 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
133 # obstore: pushdest |
|
134 # obstore: pulldest |
|
135 ## pushing from main to pushdest |
|
136 pushing to pushdest |
|
137 searching for changes |
|
138 no changes found |
|
139 remote: 3 new obsolescence markers |
|
140 ## post push state |
|
141 # obstore: main |
|
142 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
143 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
144 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
145 # obstore: pushdest |
|
146 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
147 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
148 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
149 # obstore: pulldest |
|
150 ## pulling from main into pulldest |
|
151 pulling from main |
|
152 searching for changes |
|
153 no changes found |
|
154 3 new obsolescence markers |
|
155 ## post pull state |
|
156 # obstore: main |
|
157 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
158 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
159 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
160 # obstore: pushdest |
|
161 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
162 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
163 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
164 # obstore: pulldest |
|
165 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
166 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
167 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|