|
1 |
|
2 Initial setup |
|
3 |
|
4 $ . $TESTDIR/_exc-util.sh |
|
5 |
|
6 === B.1 Prune on non targeted common changeset === |
|
7 |
|
8 .. {{{ |
|
9 .. ⊗ B |
|
10 .. | |
|
11 .. ◕ A |
|
12 .. | |
|
13 .. ● O |
|
14 .. }}} |
|
15 .. |
|
16 .. Marker exist from: |
|
17 .. |
|
18 .. * B (prune) |
|
19 .. |
|
20 .. Command run: |
|
21 .. |
|
22 .. * hg push -r O |
|
23 .. * hg push |
|
24 .. |
|
25 .. Expected exchange: |
|
26 .. |
|
27 .. * B (prune) |
|
28 |
|
29 |
|
30 $ setuprepos B.1 |
|
31 creating test repo for test case B.1 |
|
32 - pulldest |
|
33 - main |
|
34 - pushdest |
|
35 cd into `main` and proceed with env setup |
|
36 $ cd main |
|
37 $ mkcommit A |
|
38 $ mkcommit B |
|
39 $ hg prune -qd '0 0' . |
|
40 $ hg log -G --hidden |
|
41 x f6fbb35d8ac9 (draft): B |
|
42 | |
|
43 @ f5bc6836db60 (draft): A |
|
44 | |
|
45 o a9bdc8b26820 (public): O |
|
46 |
|
47 $ hg debugobsolete |
|
48 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
49 $ cd .. |
|
50 $ cd .. |
|
51 |
|
52 |
|
53 $ cp -r B.1 B.1.a |
|
54 $ cp -r B.1 B.1.b |
|
55 |
|
56 Actual Test (explicite push version) |
|
57 ----------------------------------- |
|
58 |
|
59 $ dotest B.1.a A |
|
60 ## Running testcase B.1.a |
|
61 # testing echange of "A" (f5bc6836db60) |
|
62 ## initial state |
|
63 # obstore: main |
|
64 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
65 # obstore: pushdest |
|
66 # obstore: pulldest |
|
67 ## pushing "A" from main to pushdest |
|
68 pushing to pushdest |
|
69 searching for changes |
|
70 adding changesets |
|
71 adding manifests |
|
72 adding file changes |
|
73 added 1 changesets with 1 changes to 1 files |
|
74 OBSEXC: computing relevant nodes |
|
75 OBSEXC: computing markers relevant to 2 nodes |
|
76 OBSEXC: encoding 1 markers |
|
77 OBSEXC: sending 1 pushkey payload (112 bytes) |
|
78 OBSEXC: DONE |
|
79 ## post push state |
|
80 # obstore: main |
|
81 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
82 # obstore: pushdest |
|
83 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
84 # obstore: pulldest |
|
85 ## pulling "f5bc6836db60" from main into pulldest |
|
86 pulling from main |
|
87 searching for changes |
|
88 adding changesets |
|
89 adding manifests |
|
90 adding file changes |
|
91 added 1 changesets with 1 changes to 1 files |
|
92 OBSEXC: pull obsolescence markers |
|
93 OBSEXC: merging obsolescence markers (89 bytes) |
|
94 OBSEXC: 1 markers added |
|
95 OBSEXC: DONE |
|
96 (run 'hg update' to get a working copy) |
|
97 ## post pull state |
|
98 # obstore: main |
|
99 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
100 # obstore: pushdest |
|
101 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
102 # obstore: pulldest |
|
103 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
104 |
|
105 Actual Test (bare push version) |
|
106 ----------------------------------- |
|
107 |
|
108 $ dotest B.1.b |
|
109 ## Running testcase B.1.b |
|
110 ## initial state |
|
111 # obstore: main |
|
112 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
113 # obstore: pushdest |
|
114 # obstore: pulldest |
|
115 ## pushing from main to pushdest |
|
116 pushing to pushdest |
|
117 searching for changes |
|
118 adding changesets |
|
119 adding manifests |
|
120 adding file changes |
|
121 added 1 changesets with 1 changes to 1 files |
|
122 OBSEXC: computing relevant nodes |
|
123 OBSEXC: computing markers relevant to 2 nodes |
|
124 OBSEXC: encoding 1 markers |
|
125 OBSEXC: sending 1 pushkey payload (112 bytes) |
|
126 OBSEXC: DONE |
|
127 ## post push state |
|
128 # obstore: main |
|
129 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
130 # obstore: pushdest |
|
131 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
132 # obstore: pulldest |
|
133 ## pulling from main into pulldest |
|
134 pulling from main |
|
135 searching for changes |
|
136 adding changesets |
|
137 adding manifests |
|
138 adding file changes |
|
139 added 1 changesets with 1 changes to 1 files |
|
140 OBSEXC: pull obsolescence markers |
|
141 OBSEXC: merging obsolescence markers (89 bytes) |
|
142 OBSEXC: 1 markers added |
|
143 OBSEXC: DONE |
|
144 (run 'hg update' to get a working copy) |
|
145 ## post pull state |
|
146 # obstore: main |
|
147 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
148 # obstore: pushdest |
|
149 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |
|
150 # obstore: pulldest |
|
151 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} |