|
1 ============================================ |
|
2 Testing obsolescence markers push: Cases D.2 |
|
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 2: missing prune target (prune in "pushed set") |
|
14 |
|
15 D.2 missing prune target (prune in "pushed set") |
|
16 ================================================ |
|
17 |
|
18 .. {{{ |
|
19 .. A ø⇠✕ A' |
|
20 .. |/ |
|
21 .. ● O |
|
22 .. }}} |
|
23 .. |
|
24 .. Marker exist from: |
|
25 .. |
|
26 .. * A' succeed to A |
|
27 .. * A' (prune) |
|
28 .. |
|
29 .. Command runs: |
|
30 .. |
|
31 .. * hg push |
|
32 .. |
|
33 .. Expected exchange: |
|
34 .. |
|
35 .. * `A ø⇠o A'` |
|
36 .. * A' (prune) |
|
37 |
|
38 Setup |
|
39 ----- |
|
40 |
|
41 $ . $TESTDIR/testlib/exchange-obsmarker-util.sh |
|
42 |
|
43 Initial |
|
44 |
|
45 $ setuprepos D.2 |
|
46 creating test repo for test case D.2 |
|
47 - pulldest |
|
48 - main |
|
49 - pushdest |
|
50 cd into `main` and proceed with env setup |
|
51 $ cd main |
|
52 $ mkcommit A0 |
|
53 $ hg up -q 0 |
|
54 $ mkcommit A1 |
|
55 created new head |
|
56 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
57 $ hg prune --date '0 0' . |
|
58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
59 working directory now at a9bdc8b26820 |
|
60 1 changesets pruned |
|
61 $ hg strip --hidden -q 'desc(A1)' |
|
62 $ hg log -G --hidden |
|
63 x 28b51eb45704 (draft): A0 |
|
64 | |
|
65 @ a9bdc8b26820 (public): O |
|
66 |
|
67 $ inspect_obsmarkers |
|
68 obsstore content |
|
69 ================ |
|
70 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
71 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
72 obshashtree |
|
73 =========== |
|
74 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 554c0b12f7d9fff20cb904c26e12eee337e3309c |
|
75 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 5c81c58ce0a8ad61dd9cf4c6949846b5990af30d |
|
76 obshashrange |
|
77 ============ |
|
78 rev node index size depth obshash |
|
79 0 a9bdc8b26820 0 1 1 554c0b12f7d9 |
|
80 $ cd .. |
|
81 $ cd .. |
|
82 |
|
83 Actual Test |
|
84 ----------- |
|
85 |
|
86 $ dotest D.2 |
|
87 ## Running testcase D.2 |
|
88 ## initial state |
|
89 # obstore: main |
|
90 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
91 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
92 # obstore: pushdest |
|
93 # obstore: pulldest |
|
94 ## pushing from main to pushdest |
|
95 pushing to pushdest |
|
96 searching for changes |
|
97 no changes found |
|
98 remote: 2 new obsolescence markers |
|
99 ## post push state |
|
100 # obstore: main |
|
101 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
102 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
103 # obstore: pushdest |
|
104 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
105 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
106 # obstore: pulldest |
|
107 ## pulling from main into pulldest |
|
108 pulling from main |
|
109 searching for changes |
|
110 no changes found |
|
111 2 new obsolescence markers |
|
112 ## post pull state |
|
113 # obstore: main |
|
114 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
115 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
116 # obstore: pushdest |
|
117 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
118 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
119 # obstore: pulldest |
|
120 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
121 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
122 |