Show More
@@ -0,0 +1,115 b'' | |||||
|
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 | $ cd .. | |||
|
77 | $ cd .. | |||
|
78 | ||||
|
79 | Actual Test | |||
|
80 | ----------------------------------- | |||
|
81 | ||||
|
82 | $ dotest B.3 A | |||
|
83 | ## Running testcase B.3 | |||
|
84 | # testing echange of "A" (f5bc6836db60) | |||
|
85 | ## initial state | |||
|
86 | # obstore: main | |||
|
87 | e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
88 | # obstore: pushdest | |||
|
89 | # obstore: pulldest | |||
|
90 | ## pushing "A" from main to pushdest | |||
|
91 | pushing to pushdest | |||
|
92 | searching for changes | |||
|
93 | remote: adding changesets | |||
|
94 | remote: adding manifests | |||
|
95 | remote: adding file changes | |||
|
96 | remote: added 1 changesets with 1 changes to 1 files | |||
|
97 | ## post push state | |||
|
98 | # obstore: main | |||
|
99 | e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
100 | # obstore: pushdest | |||
|
101 | # obstore: pulldest | |||
|
102 | ## pulling "f5bc6836db60" from main into pulldest | |||
|
103 | pulling from main | |||
|
104 | searching for changes | |||
|
105 | adding changesets | |||
|
106 | adding manifests | |||
|
107 | adding file changes | |||
|
108 | added 1 changesets with 1 changes to 1 files | |||
|
109 | (run 'hg update' to get a working copy) | |||
|
110 | ## post pull state | |||
|
111 | # obstore: main | |||
|
112 | e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
113 | # obstore: pushdest | |||
|
114 | # obstore: pulldest | |||
|
115 |
General Comments 0
You need to be logged in to leave comments.
Login now