##// END OF EJS Templates
obsolescence: add test case A-2 for obsolescence markers exchange...
Pierre-Yves David -
r31907:fb8c3bc2 default
parent child Browse files
Show More
@@ -0,0 +1,124
1 ============================================
2 Testing obsolescence markers push: Cases A.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 A: simple cases
13 TestCase 2: Two heads, only one of them pushed
14
15 A.2 Two heads, only on of then pushed
16 =====================================
17
18 .. {{{
19 .. β‡ β—‹ B
20 .. β‡ β—” | A
21 .. |/
22 .. ● O
23 .. }}}
24 ..
25 .. Markers exist from:
26 ..
27 .. * A
28 .. * B
29 ..
30 ..
31 .. Command runs:
32 ..
33 .. * hg push -r A
34 ..
35 .. Expected exchange:
36 ..
37 .. * chain from A
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 A.2
51 creating test repo for test case A.2
52 - pulldest
53 - main
54 - pushdest
55 cd into `main` and proceed with env setup
56 $ cd main
57 $ mkcommit A
58 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
59 $ hg up '.~1'
60 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
61 $ mkcommit B
62 created new head
63 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B)'`
64 $ hg log -G
65 @ 35b183996678 (draft): B
66 |
67 | o f5bc6836db60 (draft): A
68 |/
69 o a9bdc8b26820 (public): O
70
71 $ inspect_obsmarkers
72 obsstore content
73 ================
74 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
75 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
76 $ cd ..
77 $ cd ..
78
79 Actual Test
80 -----------
81
82 $ dotest A.2 A
83 ## Running testcase A.2
84 # testing echange of "A" (f5bc6836db60)
85 ## initial state
86 # obstore: main
87 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
88 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
89 # obstore: pushdest
90 # obstore: pulldest
91 ## pushing "A" from main to pushdest
92 pushing to pushdest
93 searching for changes
94 remote: adding changesets
95 remote: adding manifests
96 remote: adding file changes
97 remote: added 1 changesets with 1 changes to 1 files
98 remote: 1 new obsolescence markers
99 ## post push state
100 # obstore: main
101 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
102 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
103 # obstore: pushdest
104 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
105 # obstore: pulldest
106 ## pulling "f5bc6836db60" from main into pulldest
107 pulling from main
108 searching for changes
109 adding changesets
110 adding manifests
111 adding file changes
112 added 1 changesets with 1 changes to 1 files
113 1 new obsolescence markers
114 (run 'hg update' to get a working copy)
115 ## post pull state
116 # obstore: main
117 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
118 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
119 # obstore: pushdest
120 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
121 # obstore: pulldest
122 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
123
124 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now