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