1 |
|
2 |
|
3 Initial setup |
|
4 |
|
5 $ . $TESTDIR/testlib/exchange-util.sh |
|
6 |
|
7 |
|
8 === A.5 partial reordering === |
|
9 .. |
|
10 .. {{{ |
|
11 .. B ø⇠⇠ |
|
12 .. | ⇡ |
|
13 .. A ø⇠⇠⇠○ A' |
|
14 .. | ⇡/ |
|
15 .. | ○ B' |
|
16 .. |/ |
|
17 .. ● O |
|
18 .. }}} |
|
19 .. |
|
20 .. Marker exist from: |
|
21 .. |
|
22 .. * `Aø⇠○ A'` |
|
23 .. * `Bø⇠○ B'` |
|
24 .. |
|
25 .. Command run: |
|
26 .. |
|
27 .. * hg push -r B |
|
28 .. |
|
29 .. Expected exchange: |
|
30 .. |
|
31 .. * `Bø⇠○ B'` |
|
32 .. |
|
33 .. Expected Exclude: |
|
34 .. |
|
35 .. * `Aø⇠○ A'` |
|
36 |
|
37 |
|
38 initial |
|
39 |
|
40 $ setuprepos A.5 |
|
41 creating test repo for test case A.5 |
|
42 - pulldest |
|
43 - main |
|
44 - pushdest |
|
45 cd into `main` and proceed with env setup |
|
46 $ cd main |
|
47 $ mkcommit A0 |
|
48 $ mkcommit B0 |
|
49 $ hg update 0 |
|
50 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
51 $ mkcommit B1 |
|
52 created new head |
|
53 $ mkcommit A1 |
|
54 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` |
|
55 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` |
|
56 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
57 $ hg log -G --hidden |
|
58 @ 8c0a98c83722 (draft): A1 |
|
59 | |
|
60 o f6298a8ac3a4 (draft): B1 |
|
61 | |
|
62 | x 6e72f0a95b5e (draft): B0 |
|
63 | | |
|
64 | x 28b51eb45704 (draft): A0 |
|
65 |/ |
|
66 o a9bdc8b26820 (public): O |
|
67 |
|
68 $ hg debugobsolete |
|
69 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
70 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
71 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
72 $ hg debugobsrelsethashtree |
|
73 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
|
74 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 5d69322fad9eb1ba8f8f2c2312346ed347fdde76 |
|
75 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 fd3e5712c9c2d216547d7a1b87ac815ee1fb7542 |
|
76 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 91716bfd671b5a5854a47ac5d392edfdd25e431a |
|
77 8c0a98c8372212c6efde4bfdcef006f27ff759d3 6e8c8c71c47a2bfc27c7cf2b1f4174977ede9f21 |
|
78 $ hg debugobshashrange --subranges --rev 'head()' |
|
79 rev node index size depth obshash |
|
80 4 8c0a98c83722 0 3 3 70185b996296 |
|
81 3 f6298a8ac3a4 0 2 2 91716bfd671b |
|
82 4 8c0a98c83722 2 1 3 4d835a45c1e9 |
|
83 0 a9bdc8b26820 0 1 1 000000000000 |
|
84 3 f6298a8ac3a4 1 1 2 91716bfd671b |
|
85 $ cd .. |
|
86 $ cd .. |
|
87 |
|
88 Actual Test |
|
89 ----------- |
|
90 |
|
91 $ dotest A.5 B1 |
|
92 ## Running testcase A.5 |
|
93 # testing echange of "B1" (f6298a8ac3a4) |
|
94 ## initial state |
|
95 # obstore: main |
|
96 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
97 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
98 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
99 # obstore: pushdest |
|
100 # obstore: pulldest |
|
101 ## pushing "B1" from main to pushdest |
|
102 pushing to pushdest |
|
103 searching for changes |
|
104 remote: adding changesets |
|
105 remote: adding manifests |
|
106 remote: adding file changes |
|
107 remote: added 1 changesets with 1 changes to 1 files |
|
108 remote: 1 new obsolescence markers |
|
109 ## post push state |
|
110 # obstore: main |
|
111 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
112 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
113 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
114 # obstore: pushdest |
|
115 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
116 # obstore: pulldest |
|
117 ## pulling "f6298a8ac3a4" from main into pulldest |
|
118 pulling from main |
|
119 searching for changes |
|
120 adding changesets |
|
121 adding manifests |
|
122 adding file changes |
|
123 added 1 changesets with 1 changes to 1 files |
|
124 1 new obsolescence markers |
|
125 (run 'hg update' to get a working copy) |
|
126 ## post pull state |
|
127 # obstore: main |
|
128 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
129 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
130 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
131 # obstore: pushdest |
|
132 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
133 # obstore: pulldest |
|
134 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|