|
1 |
|
2 Initial setup |
|
3 |
|
4 $ . $TESTDIR/_exc-util.sh |
|
5 |
|
6 === C.1 Multiple pruned changeset atop each other === |
|
7 .. |
|
8 .. {{{ |
|
9 .. ⊗ B |
|
10 .. | |
|
11 .. ⊗ A |
|
12 .. | |
|
13 .. ● O |
|
14 .. }}} |
|
15 .. |
|
16 .. Marker exist from: |
|
17 .. |
|
18 .. * A (prune) |
|
19 .. * B (prune) |
|
20 .. |
|
21 .. Command run: |
|
22 .. |
|
23 .. * hg push -r O |
|
24 .. * hg push |
|
25 .. |
|
26 .. Expected exchange: |
|
27 .. |
|
28 .. * A (prune) |
|
29 .. * B (prune) |
|
30 |
|
31 $ setuprepos C.1 |
|
32 creating test repo for test case C.1 |
|
33 - pulldest |
|
34 - main |
|
35 - pushdest |
|
36 cd into `main` and proceed with env setup |
|
37 $ cd main |
|
38 $ mkcommit A |
|
39 $ mkcommit B |
|
40 $ hg prune -qd '0 0' .^::. |
|
41 $ hg log -G --hidden |
|
42 x f6fbb35d8ac9 (draft): B |
|
43 | |
|
44 x f5bc6836db60 (draft): A |
|
45 | |
|
46 @ a9bdc8b26820 (public): O |
|
47 |
|
48 $ hg debugobsolete |
|
49 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
50 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
51 $ cd .. |
|
52 $ cd .. |
|
53 |
|
54 $ cp -r C.1 C.1.a |
|
55 $ cp -r C.1 C.1.b |
|
56 |
|
57 Actual Test (explicit push) |
|
58 --------------------------- |
|
59 |
|
60 $ dotest C.1.a O |
|
61 ## Running testcase C.1.a |
|
62 # testing echange of "O" (a9bdc8b26820) |
|
63 ## initial state |
|
64 # obstore: main |
|
65 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
66 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
67 # obstore: pushdest |
|
68 # obstore: pulldest |
|
69 ## pushing "O" from main to pushdest |
|
70 pushing to pushdest |
|
71 searching for changes |
|
72 no changes found |
|
73 remote: 2 new obsolescence markers |
|
74 ## post push state |
|
75 # obstore: main |
|
76 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
77 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
78 # obstore: pushdest |
|
79 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
80 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
81 # obstore: pulldest |
|
82 ## pulling "a9bdc8b26820" from main into pulldest |
|
83 pulling from main |
|
84 no changes found |
|
85 2 new obsolescence markers |
|
86 ## post pull state |
|
87 # obstore: main |
|
88 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
89 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
90 # obstore: pushdest |
|
91 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
92 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
93 # obstore: pulldest |
|
94 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
95 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
96 |
|
97 Actual Test (bare push) |
|
98 ------------------------------------- |
|
99 |
|
100 $ dotest C.1.b |
|
101 ## Running testcase C.1.b |
|
102 ## initial state |
|
103 # obstore: main |
|
104 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
105 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
106 # obstore: pushdest |
|
107 # obstore: pulldest |
|
108 ## pushing from main to pushdest |
|
109 pushing to pushdest |
|
110 searching for changes |
|
111 no changes found |
|
112 remote: 2 new obsolescence markers |
|
113 ## post push state |
|
114 # obstore: main |
|
115 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
116 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
117 # obstore: pushdest |
|
118 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
119 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
120 # obstore: pulldest |
|
121 ## pulling from main into pulldest |
|
122 pulling from main |
|
123 searching for changes |
|
124 no changes found |
|
125 2 new obsolescence markers |
|
126 ## post pull state |
|
127 # obstore: main |
|
128 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
129 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
130 # obstore: pushdest |
|
131 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
132 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
133 # obstore: pulldest |
|
134 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
135 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |