|
1 ============================================ |
|
2 Testing obsolescence markers push: Cases B.3 |
|
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 3: Pruned changeset on non-pushed part of the history |
|
14 |
|
15 B.3 Pruned changeset on non-pushed part of the history |
|
16 ====================================================== |
|
17 |
|
18 .. {{{ |
|
19 .. ⊗ C |
|
20 .. | |
|
21 .. ○ B |
|
22 .. | ◔ A |
|
23 .. |/ |
|
24 .. ● O |
|
25 .. }}} |
|
26 .. |
|
27 .. Marker exists from: |
|
28 .. |
|
29 .. * C (prune) |
|
30 .. |
|
31 .. Commands run: |
|
32 .. |
|
33 .. * hg push -r A |
|
34 .. |
|
35 .. Expected exchange: |
|
36 .. |
|
37 .. * ø |
|
38 .. |
|
39 .. Expected exclude: |
|
40 .. |
|
41 .. * chain from B |
|
42 |
|
43 Setup |
|
44 ----- |
|
45 |
|
46 $ . $TESTDIR/testlib/exchange-obsmarker-util.sh |
|
47 |
|
48 initial |
|
49 |
|
50 $ setuprepos B.3 |
|
51 creating test repo for test case B.3 |
|
52 - pulldest |
|
53 - main |
|
54 - pushdest |
|
55 cd into `main` and proceed with env setup |
|
56 $ cd main |
|
57 $ mkcommit A |
|
58 $ hg up --quiet 0 |
|
59 $ mkcommit B |
|
60 created new head |
|
61 $ mkcommit C |
|
62 $ hg prune -qd '0 0' . |
|
63 $ hg log -G --hidden |
|
64 x e56289ab6378 (draft): C |
|
65 | |
|
66 @ 35b183996678 (draft): B |
|
67 | |
|
68 | o f5bc6836db60 (draft): A |
|
69 |/ |
|
70 o a9bdc8b26820 (public): O |
|
71 |
|
72 $ inspect_obsmarkers |
|
73 obsstore content |
|
74 ================ |
|
75 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
76 obshashtree |
|
77 =========== |
|
78 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
|
79 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0000000000000000000000000000000000000000 |
|
80 35b1839966785d5703a01607229eea932db42f87 631ab4cd02ffa1d144dc8f32a18be574076031e3 |
|
81 e56289ab6378dc752fd7965f8bf66b58bda740bd 47c9d2d8db5d4b1eddd0266329ad260ccc84772c |
|
82 obshashrange |
|
83 ============ |
|
84 rev node index size depth obshash |
|
85 2 35b183996678 0 2 2 631ab4cd02ff |
|
86 1 f5bc6836db60 0 2 2 000000000000 |
|
87 2 35b183996678 1 1 2 631ab4cd02ff |
|
88 0 a9bdc8b26820 0 1 1 000000000000 |
|
89 1 f5bc6836db60 1 1 2 000000000000 |
|
90 $ cd .. |
|
91 $ cd .. |
|
92 |
|
93 Actual Test |
|
94 ----------------------------------- |
|
95 |
|
96 $ dotest B.3 A |
|
97 ## Running testcase B.3 |
|
98 # testing echange of "A" (f5bc6836db60) |
|
99 ## initial state |
|
100 # obstore: main |
|
101 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
102 # obstore: pushdest |
|
103 # obstore: pulldest |
|
104 ## pushing "A" from main to pushdest |
|
105 pushing to pushdest |
|
106 searching for changes |
|
107 remote: adding changesets |
|
108 remote: adding manifests |
|
109 remote: adding file changes |
|
110 remote: added 1 changesets with 1 changes to 1 files |
|
111 ## post push state |
|
112 # obstore: main |
|
113 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
114 # obstore: pushdest |
|
115 # obstore: pulldest |
|
116 ## pulling "f5bc6836db60" from main into pulldest |
|
117 pulling from main |
|
118 searching for changes |
|
119 adding changesets |
|
120 adding manifests |
|
121 adding file changes |
|
122 added 1 changesets with 1 changes to 1 files |
|
123 (run 'hg update' to get a working copy) |
|
124 ## post pull state |
|
125 # obstore: main |
|
126 e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
127 # obstore: pushdest |
|
128 # obstore: pulldest |
|
129 |