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