Show More
@@ -0,0 +1,104 b'' | |||
|
1 | ============================================ | |
|
2 | Testing obsolescence markers push: Cases B.1 | |
|
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 1: Prune on non-targeted common changeset | |
|
14 | ||
|
15 | B.1 Prune on non-targeted common changeset | |
|
16 | ========================================== | |
|
17 | ||
|
18 | .. {{{ | |
|
19 | .. β B | |
|
20 | .. | | |
|
21 | .. β A | |
|
22 | .. | | |
|
23 | .. β O | |
|
24 | .. }}} | |
|
25 | .. | |
|
26 | .. Marker exist from: | |
|
27 | .. | |
|
28 | .. * B (prune) | |
|
29 | .. | |
|
30 | .. Command runs: | |
|
31 | .. | |
|
32 | .. * hg push -r O | |
|
33 | .. | |
|
34 | .. Expected exclude: | |
|
35 | .. | |
|
36 | .. * B (prune) | |
|
37 | ||
|
38 | Setup | |
|
39 | ----- | |
|
40 | ||
|
41 | $ . $TESTDIR/testlib/exchange-obsmarker-util.sh | |
|
42 | ||
|
43 | Initial | |
|
44 | ||
|
45 | $ setuprepos B.1 | |
|
46 | creating test repo for test case B.1 | |
|
47 | - pulldest | |
|
48 | - main | |
|
49 | - pushdest | |
|
50 | cd into `main` and proceed with env setup | |
|
51 | $ cd main | |
|
52 | $ mkcommit A | |
|
53 | $ mkcommit B | |
|
54 | ||
|
55 | make both changeset known in remote | |
|
56 | ||
|
57 | $ hg push -qf ../pushdest | |
|
58 | $ hg push -qf ../pulldest | |
|
59 | ||
|
60 | create prune marker | |
|
61 | ||
|
62 | $ hg prune -qd '0 0' . | |
|
63 | $ hg log -G --hidden | |
|
64 | x f6fbb35d8ac9 (draft): B | |
|
65 | | | |
|
66 | @ f5bc6836db60 (draft): A | |
|
67 | | | |
|
68 | o a9bdc8b26820 (public): O | |
|
69 | ||
|
70 | $ inspect_obsmarkers | |
|
71 | obsstore content | |
|
72 | ================ | |
|
73 | f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
74 | $ cd .. | |
|
75 | $ cd .. | |
|
76 | ||
|
77 | Actual Test | |
|
78 | ----------- | |
|
79 | ||
|
80 | $ dotest B.1 O | |
|
81 | ## Running testcase B.1 | |
|
82 | # testing echange of "O" (a9bdc8b26820) | |
|
83 | ## initial state | |
|
84 | # obstore: main | |
|
85 | f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
86 | # obstore: pushdest | |
|
87 | # obstore: pulldest | |
|
88 | ## pushing "O" from main to pushdest | |
|
89 | pushing to pushdest | |
|
90 | searching for changes | |
|
91 | no changes found | |
|
92 | ## post push state | |
|
93 | # obstore: main | |
|
94 | f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
95 | # obstore: pushdest | |
|
96 | # obstore: pulldest | |
|
97 | ## pulling "a9bdc8b26820" from main into pulldest | |
|
98 | pulling from main | |
|
99 | no changes found | |
|
100 | ## post pull state | |
|
101 | # obstore: main | |
|
102 | f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
103 | # obstore: pushdest | |
|
104 | # obstore: pulldest |
General Comments 0
You need to be logged in to leave comments.
Login now