|
1 |
|
2 |
|
3 Initial setup |
|
4 |
|
5 $ . $TESTDIR/_exc-util.sh |
|
6 |
|
7 === C.2 Pruned changeset on precursors === |
|
8 |
|
9 .. {{{ |
|
10 .. B ⊗ |
|
11 .. | |
|
12 .. A ø⇠◔ A' |
|
13 .. |/ |
|
14 .. ● O |
|
15 .. }}} |
|
16 .. |
|
17 .. Marker exist from: |
|
18 .. |
|
19 .. * A' succeed to A |
|
20 .. * B (prune) |
|
21 .. |
|
22 .. Command run: |
|
23 .. |
|
24 .. * hg push -r A' |
|
25 .. * hg push |
|
26 .. |
|
27 .. Expected exchange: |
|
28 .. |
|
29 .. * `A ø⇠o A'` |
|
30 .. * B (prune) |
|
31 |
|
32 $ setuprepos C.2 |
|
33 creating test repo for test case C.2 |
|
34 - pulldest |
|
35 - main |
|
36 - pushdest |
|
37 cd into `main` and proceed with env setup |
|
38 $ cd main |
|
39 $ mkcommit A0 |
|
40 $ mkcommit B |
|
41 $ hg prune -qd '0 0' . |
|
42 $ hg update -q 0 |
|
43 $ mkcommit A1 |
|
44 created new head |
|
45 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
46 $ hg log -G --hidden |
|
47 @ e5ea8f9c7314 (draft): A1 |
|
48 | |
|
49 | x 06055a7959d4 (draft): B |
|
50 | | |
|
51 | x 28b51eb45704 (draft): A0 |
|
52 |/ |
|
53 o a9bdc8b26820 (public): O |
|
54 |
|
55 $ hg debugobsolete |
|
56 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
57 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
58 $ cd .. |
|
59 $ cd .. |
|
60 |
|
61 $ cp -r C.2 C.2.a |
|
62 $ cp -r C.2 C.2.b |
|
63 |
|
64 Actual Test (explicit push) |
|
65 --------------------------- |
|
66 |
|
67 $ dotest C.2.a A1 |
|
68 ## Running testcase C.2.a |
|
69 # testing echange of "A1" (e5ea8f9c7314) |
|
70 ## initial state |
|
71 # obstore: main |
|
72 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
73 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
74 # obstore: pushdest |
|
75 # obstore: pulldest |
|
76 ## pushing "A1" from main to pushdest |
|
77 pushing to pushdest |
|
78 searching for changes |
|
79 remote: adding changesets |
|
80 remote: adding manifests |
|
81 remote: adding file changes |
|
82 remote: added 1 changesets with 1 changes to 1 files |
|
83 remote: 2 new obsolescence markers |
|
84 ## post push state |
|
85 # obstore: main |
|
86 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
87 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
88 # obstore: pushdest |
|
89 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
90 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
91 # obstore: pulldest |
|
92 ## pulling "e5ea8f9c7314" from main into pulldest |
|
93 pulling from main |
|
94 searching for changes |
|
95 adding changesets |
|
96 adding manifests |
|
97 adding file changes |
|
98 added 1 changesets with 1 changes to 1 files |
|
99 2 new obsolescence markers |
|
100 (run 'hg update' to get a working copy) |
|
101 ## post pull state |
|
102 # obstore: main |
|
103 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
104 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
105 # obstore: pushdest |
|
106 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
107 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
108 # obstore: pulldest |
|
109 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
110 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
111 |
|
112 Actual Test (bare push) |
|
113 ------------------------------------- |
|
114 |
|
115 $ dotest C.2.b |
|
116 ## Running testcase C.2.b |
|
117 ## initial state |
|
118 # obstore: main |
|
119 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
120 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
121 # obstore: pushdest |
|
122 # obstore: pulldest |
|
123 ## pushing from main to pushdest |
|
124 pushing to pushdest |
|
125 searching for changes |
|
126 remote: adding changesets |
|
127 remote: adding manifests |
|
128 remote: adding file changes |
|
129 remote: added 1 changesets with 1 changes to 1 files |
|
130 remote: 2 new obsolescence markers |
|
131 ## post push state |
|
132 # obstore: main |
|
133 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
134 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
135 # obstore: pushdest |
|
136 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
137 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
138 # obstore: pulldest |
|
139 ## pulling from main into pulldest |
|
140 pulling from main |
|
141 searching for changes |
|
142 adding changesets |
|
143 adding manifests |
|
144 adding file changes |
|
145 added 1 changesets with 1 changes to 1 files |
|
146 2 new obsolescence markers |
|
147 (run 'hg update' to get a working copy) |
|
148 ## post pull state |
|
149 # obstore: main |
|
150 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
151 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
152 # obstore: pushdest |
|
153 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
154 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
155 # obstore: pulldest |
|
156 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
157 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |