1 |
|
2 Initial setup |
|
3 |
|
4 $ . $TESTDIR/testlib/exchange-util.sh |
|
5 |
|
6 === C.1 Multiple pruned changeset atop each other === |
|
7 .. |
|
8 .. {{{ |
|
9 .. ⊗ B |
|
10 .. | |
|
11 .. ⊗ A |
|
12 .. | |
|
13 .. ● O |
|
14 .. }}} |
|
15 .. |
|
16 .. Marker exist from: |
|
17 .. |
|
18 .. * A (prune) |
|
19 .. * B (prune) |
|
20 .. |
|
21 .. Command run: |
|
22 .. |
|
23 .. * hg push -r O |
|
24 .. * hg push |
|
25 .. |
|
26 .. Expected exchange: |
|
27 .. |
|
28 .. * A (prune) |
|
29 .. * B (prune) |
|
30 |
|
31 $ setuprepos C.1 |
|
32 creating test repo for test case C.1 |
|
33 - pulldest |
|
34 - main |
|
35 - pushdest |
|
36 cd into `main` and proceed with env setup |
|
37 $ cd main |
|
38 $ mkcommit A |
|
39 $ mkcommit B |
|
40 $ hg prune -qd '0 0' .^::. |
|
41 $ hg log -G --hidden |
|
42 x f6fbb35d8ac9 (draft): B |
|
43 | |
|
44 x f5bc6836db60 (draft): A |
|
45 | |
|
46 @ a9bdc8b26820 (public): O |
|
47 |
|
48 $ hg debugobsolete |
|
49 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
50 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
51 $ hg debugobsrelsethashtree |
|
52 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 1ce18e5a71f78d443a80c819f2f7197c4706af70 |
|
53 f5bc6836db60e308a17ba08bf050154ba9c4fad7 92af733686ce7e0469d8b2b87b4612a4c2d33468 |
|
54 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 3800aeba3728457abb9c508c94f6abc59e698c55 |
|
55 $ hg debugobshashrange --subranges --rev 'head()' |
|
56 rev node index size depth obshash |
|
57 0 a9bdc8b26820 0 1 1 1ce18e5a71f7 |
|
58 $ cd .. |
|
59 $ cd .. |
|
60 |
|
61 $ cp -r C.1 C.1.a |
|
62 $ cp -r C.1 C.1.b |
|
63 |
|
64 Actual Test (explicit push) |
|
65 --------------------------- |
|
66 |
|
67 $ dotest C.1.a O |
|
68 ## Running testcase C.1.a |
|
69 # testing echange of "O" (a9bdc8b26820) |
|
70 ## initial state |
|
71 # obstore: main |
|
72 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
73 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
74 # obstore: pushdest |
|
75 # obstore: pulldest |
|
76 ## pushing "O" from main to pushdest |
|
77 pushing to pushdest |
|
78 searching for changes |
|
79 no changes found |
|
80 remote: 2 new obsolescence markers |
|
81 ## post push state |
|
82 # obstore: main |
|
83 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
84 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
85 # obstore: pushdest |
|
86 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
87 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
88 # obstore: pulldest |
|
89 ## pulling "a9bdc8b26820" from main into pulldest |
|
90 pulling from main |
|
91 no changes found |
|
92 2 new obsolescence markers |
|
93 ## post pull state |
|
94 # obstore: main |
|
95 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
96 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
97 # obstore: pushdest |
|
98 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
99 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
100 # obstore: pulldest |
|
101 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
102 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
103 |
|
104 Actual Test (bare push) |
|
105 ------------------------------------- |
|
106 |
|
107 $ dotest C.1.b |
|
108 ## Running testcase C.1.b |
|
109 ## initial state |
|
110 # obstore: main |
|
111 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
112 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
113 # obstore: pushdest |
|
114 # obstore: pulldest |
|
115 ## pushing from main to pushdest |
|
116 pushing to pushdest |
|
117 searching for changes |
|
118 no changes found |
|
119 remote: 2 new obsolescence markers |
|
120 ## post push state |
|
121 # obstore: main |
|
122 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
123 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
124 # obstore: pushdest |
|
125 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
126 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
127 # obstore: pulldest |
|
128 ## pulling from main into pulldest |
|
129 pulling from main |
|
130 searching for changes |
|
131 no changes found |
|
132 2 new obsolescence markers |
|
133 ## post pull state |
|
134 # obstore: main |
|
135 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
136 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
137 # obstore: pushdest |
|
138 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
139 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
140 # obstore: pulldest |
|
141 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
142 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|