|
1 ============================================ |
|
2 Testing obsolescence markers push: Cases B.7 |
|
3 ============================================ |
|
4 |
|
5 Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of |
|
6 all changesets that requested to be "in sync" after the push (even if they are |
|
7 already on both side). |
|
8 |
|
9 This test belongs to a series of tests checking such set is properly computed |
|
10 and applied. This does not tests "obsmarkers" discovery capabilities. |
|
11 |
|
12 Category B: pruning case |
|
13 TestCase 7: Prune on non-targeted common changeset |
|
14 |
|
15 B.7 Prune above non-targeted common changeset |
|
16 ============================================= |
|
17 |
|
18 .. (very similar to B1, but the prune changeset is unknown on remote) |
|
19 .. |
|
20 .. {{{ |
|
21 .. ⊗ B |
|
22 .. | |
|
23 .. ◕ A |
|
24 .. | |
|
25 .. ● O |
|
26 .. }}} |
|
27 .. |
|
28 .. Marker exist from: |
|
29 .. |
|
30 .. * B (prune) |
|
31 .. |
|
32 .. Command runs: |
|
33 .. |
|
34 .. * hg push -r O |
|
35 .. |
|
36 .. Expected exclude: |
|
37 .. |
|
38 .. * B (prune) |
|
39 |
|
40 Setup |
|
41 ----- |
|
42 |
|
43 $ . $TESTDIR/testlib/exchange-obsmarker-util.sh |
|
44 |
|
45 Initial |
|
46 |
|
47 $ setuprepos B.7 |
|
48 creating test repo for test case B.7 |
|
49 - pulldest |
|
50 - main |
|
51 - pushdest |
|
52 cd into `main` and proceed with env setup |
|
53 $ cd main |
|
54 $ mkcommit A |
|
55 $ hg push -q ../pushdest |
|
56 $ hg push -q ../pulldest |
|
57 $ mkcommit B |
|
58 $ hg prune -qd '0 0' . |
|
59 $ hg log -G --hidden |
|
60 x f6fbb35d8ac9 (draft): B |
|
61 | |
|
62 @ f5bc6836db60 (draft): A |
|
63 | |
|
64 o a9bdc8b26820 (public): O |
|
65 |
|
66 $ inspect_obsmarkers |
|
67 obsstore content |
|
68 ================ |
|
69 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
70 obshashtree |
|
71 =========== |
|
72 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
|
73 f5bc6836db60e308a17ba08bf050154ba9c4fad7 926d9d84b97b3483891ae983990ad87c1f7827e9 |
|
74 f6fbb35d8ac958bbe70035e4c789c18471cdc0af e041f7ff1c7bd5501c7ab602baa35f0873128021 |
|
75 obshashrange |
|
76 ============ |
|
77 rev node index size depth obshash |
|
78 1 f5bc6836db60 0 2 2 926d9d84b97b |
|
79 0 a9bdc8b26820 0 1 1 000000000000 |
|
80 1 f5bc6836db60 1 1 2 926d9d84b97b |
|
81 $ cd .. |
|
82 $ cd .. |
|
83 |
|
84 Actual Test |
|
85 ------------------------------------- |
|
86 |
|
87 $ dotest B.7 O |
|
88 ## Running testcase B.7 |
|
89 # testing echange of "O" (a9bdc8b26820) |
|
90 ## initial state |
|
91 # obstore: main |
|
92 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
93 # obstore: pushdest |
|
94 # obstore: pulldest |
|
95 ## pushing "O" from main to pushdest |
|
96 pushing to pushdest |
|
97 searching for changes |
|
98 no changes found |
|
99 ## post push state |
|
100 # obstore: main |
|
101 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
102 # obstore: pushdest |
|
103 # obstore: pulldest |
|
104 ## pulling "a9bdc8b26820" from main into pulldest |
|
105 pulling from main |
|
106 no changes found |
|
107 ## post pull state |
|
108 # obstore: main |
|
109 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
110 # obstore: pushdest |
|
111 # obstore: pulldest |