Show More
@@ -0,0 +1,138 b'' | |||||
|
1 | ============================================ | |||
|
2 | Testing obsolescence markers push: Cases D.4 | |||
|
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 D: Partial Information Case | |||
|
13 | TestCase 4: Unknown changeset in between known changesets | |||
|
14 | ||||
|
15 | D.4 Unknown changeset in between known one | |||
|
16 | ========================================== | |||
|
17 | ||||
|
18 | .. Mostly a clarification case | |||
|
19 | .. | |||
|
20 | .. {{{ | |||
|
21 | .. B ΓΈβ ββ β B'' | |||
|
22 | .. | | | |||
|
23 | .. A ΓΈβ ββ β A' | |||
|
24 | .. \ / | |||
|
25 | .. β O | |||
|
26 | .. | |||
|
27 | .. }}} | |||
|
28 | .. | |||
|
29 | .. Should be treated as A.3 case: | |||
|
30 | .. | |||
|
31 | .. {{{ | |||
|
32 | .. | |||
|
33 | .. B ΓΈβ β B'' | |||
|
34 | .. | | | |||
|
35 | .. A ΓΈβ β A' | |||
|
36 | .. |/ | |||
|
37 | .. β O | |||
|
38 | .. | |||
|
39 | .. }}} | |||
|
40 | ||||
|
41 | Setup | |||
|
42 | ----- | |||
|
43 | ||||
|
44 | $ . $TESTDIR/testlib/exchange-obsmarker-util.sh | |||
|
45 | ||||
|
46 | initial | |||
|
47 | ||||
|
48 | $ setuprepos D.4 | |||
|
49 | creating test repo for test case D.4 | |||
|
50 | - pulldest | |||
|
51 | - main | |||
|
52 | - pushdest | |||
|
53 | cd into `main` and proceed with env setup | |||
|
54 | $ cd main | |||
|
55 | $ mkcommit A0 | |||
|
56 | $ mkcommit B0 | |||
|
57 | $ hg update -q 0 | |||
|
58 | $ mkcommit A1 | |||
|
59 | created new head | |||
|
60 | $ mkcommit B1 | |||
|
61 | $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | |||
|
62 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'` | |||
|
63 | $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |||
|
64 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'` | |||
|
65 | $ hg log -G --hidden | |||
|
66 | @ 069b05c3876d (draft): B1 | |||
|
67 | | | |||
|
68 | o e5ea8f9c7314 (draft): A1 | |||
|
69 | | | |||
|
70 | | x 6e72f0a95b5e (draft): B0 | |||
|
71 | | | | |||
|
72 | | x 28b51eb45704 (draft): A0 | |||
|
73 | |/ | |||
|
74 | o a9bdc8b26820 (public): O | |||
|
75 | ||||
|
76 | $ inspect_obsmarkers | |||
|
77 | obsstore content | |||
|
78 | ================ | |||
|
79 | 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
80 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
81 | 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
82 | bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
83 | $ cd .. | |||
|
84 | $ cd .. | |||
|
85 | ||||
|
86 | Actual Test | |||
|
87 | ----------- | |||
|
88 | ||||
|
89 | $ dotest D.4 A1 | |||
|
90 | ## Running testcase D.4 | |||
|
91 | # testing echange of "A1" (e5ea8f9c7314) | |||
|
92 | ## initial state | |||
|
93 | # obstore: main | |||
|
94 | 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
95 | 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
96 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
97 | bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
98 | # obstore: pushdest | |||
|
99 | # obstore: pulldest | |||
|
100 | ## pushing "A1" from main to pushdest | |||
|
101 | pushing to pushdest | |||
|
102 | searching for changes | |||
|
103 | remote: adding changesets | |||
|
104 | remote: adding manifests | |||
|
105 | remote: adding file changes | |||
|
106 | remote: added 1 changesets with 1 changes to 1 files | |||
|
107 | remote: 2 new obsolescence markers | |||
|
108 | ## post push state | |||
|
109 | # obstore: main | |||
|
110 | 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
111 | 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
112 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
113 | bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
114 | # obstore: pushdest | |||
|
115 | 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
116 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
117 | # obstore: pulldest | |||
|
118 | ## pulling "e5ea8f9c7314" from main into pulldest | |||
|
119 | pulling from main | |||
|
120 | searching for changes | |||
|
121 | adding changesets | |||
|
122 | adding manifests | |||
|
123 | adding file changes | |||
|
124 | added 1 changesets with 1 changes to 1 files | |||
|
125 | 2 new obsolescence markers | |||
|
126 | (run 'hg update' to get a working copy) | |||
|
127 | ## post pull state | |||
|
128 | # obstore: main | |||
|
129 | 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
130 | 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
131 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
132 | bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
133 | # obstore: pushdest | |||
|
134 | 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
135 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
136 | # obstore: pulldest | |||
|
137 | 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
138 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
General Comments 0
You need to be logged in to leave comments.
Login now