1 |
|
2 Initial setup |
|
3 |
|
4 $ . $TESTDIR/testlib/exchange-util.sh |
|
5 |
|
6 === B.4 Pruned changeset on common part of history === |
|
7 |
|
8 .. {{{ |
|
9 .. ⊗ C |
|
10 .. | ● B |
|
11 .. | | |
|
12 .. | ● A |
|
13 .. |/ |
|
14 .. ● O |
|
15 .. }}} |
|
16 .. |
|
17 .. Marker exist from: |
|
18 .. |
|
19 .. * C (prune) |
|
20 .. |
|
21 .. Command run: |
|
22 .. |
|
23 .. * hg push -r B |
|
24 .. * hg push |
|
25 .. |
|
26 .. Expected exchange: |
|
27 .. |
|
28 .. * prune for C |
|
29 |
|
30 |
|
31 $ setuprepos B.4 |
|
32 creating test repo for test case B.4 |
|
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 phase --public . |
|
41 $ hg push ../pushdest |
|
42 pushing to ../pushdest |
|
43 searching for changes |
|
44 remote: adding changesets |
|
45 remote: adding manifests |
|
46 remote: adding file changes |
|
47 remote: added 2 changesets with 2 changes to 2 files |
|
48 $ hg push ../pulldest |
|
49 pushing to ../pulldest |
|
50 searching for changes |
|
51 remote: adding changesets |
|
52 remote: adding manifests |
|
53 remote: adding file changes |
|
54 remote: added 2 changesets with 2 changes to 2 files |
|
55 $ hg update -q 0 |
|
56 $ mkcommit C |
|
57 created new head |
|
58 $ hg prune -qd '0 0' . |
|
59 $ hg log -G --hidden |
|
60 x 7f7f229b13a6 (draft): C |
|
61 | |
|
62 | o f6fbb35d8ac9 (public): B |
|
63 | | |
|
64 | o f5bc6836db60 (public): A |
|
65 |/ |
|
66 @ a9bdc8b26820 (public): O |
|
67 |
|
68 $ hg debugobsolete |
|
69 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
70 $ hg debugobsrelsethashtree |
|
71 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 1900882e85db10a1dc5bc7748f436a8a834356c6 |
|
72 f5bc6836db60e308a17ba08bf050154ba9c4fad7 c27e764c783f451ef3aa40daf2a3795e6674cd06 |
|
73 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 907beff79fdff2b82b5d3bed7989107a6d744508 |
|
74 7f7f229b13a629a5b20581c6cb723f4e2ca54bed c27e764c783f451ef3aa40daf2a3795e6674cd06 |
|
75 $ hg debugobshashrange --subranges --rev 'head()' |
|
76 rev node index size depth obshash |
|
77 2 f6fbb35d8ac9 0 3 3 000000000000 |
|
78 1 f5bc6836db60 0 2 2 000000000000 |
|
79 0 a9bdc8b26820 0 1 1 1900882e85db |
|
80 1 f5bc6836db60 1 1 2 000000000000 |
|
81 2 f6fbb35d8ac9 2 1 3 000000000000 |
|
82 $ cd .. |
|
83 $ cd .. |
|
84 |
|
85 |
|
86 $ cp -r B.4 B.4.a |
|
87 $ cp -r B.4 B.4.b |
|
88 |
|
89 Actual Test (explicit push version) |
|
90 ----------------------------------- |
|
91 |
|
92 $ dotest B.4.a O |
|
93 ## Running testcase B.4.a |
|
94 # testing echange of "O" (a9bdc8b26820) |
|
95 ## initial state |
|
96 # obstore: main |
|
97 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
98 # obstore: pushdest |
|
99 # obstore: pulldest |
|
100 ## pushing "O" from main to pushdest |
|
101 pushing to pushdest |
|
102 searching for changes |
|
103 no changes found |
|
104 remote: 1 new obsolescence markers |
|
105 ## post push state |
|
106 # obstore: main |
|
107 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
108 # obstore: pushdest |
|
109 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
110 # obstore: pulldest |
|
111 ## pulling "a9bdc8b26820" from main into pulldest |
|
112 pulling from main |
|
113 no changes found |
|
114 1 new obsolescence markers |
|
115 ## post pull state |
|
116 # obstore: main |
|
117 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
118 # obstore: pushdest |
|
119 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
120 # obstore: pulldest |
|
121 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
122 |
|
123 Actual Test (bare push version) |
|
124 ----------------------------------- |
|
125 |
|
126 $ dotest B.4.b |
|
127 ## Running testcase B.4.b |
|
128 ## initial state |
|
129 # obstore: main |
|
130 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
131 # obstore: pushdest |
|
132 # obstore: pulldest |
|
133 ## pushing from main to pushdest |
|
134 pushing to pushdest |
|
135 searching for changes |
|
136 no changes found |
|
137 remote: 1 new obsolescence markers |
|
138 ## post push state |
|
139 # obstore: main |
|
140 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
141 # obstore: pushdest |
|
142 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
143 # obstore: pulldest |
|
144 ## pulling from main into pulldest |
|
145 pulling from main |
|
146 searching for changes |
|
147 no changes found |
|
148 1 new obsolescence markers |
|
149 ## post pull state |
|
150 # obstore: main |
|
151 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
152 # obstore: pushdest |
|
153 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
154 # obstore: pulldest |
|
155 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|