24 $ hg debugobsolete 3 2 |
24 $ hg debugobsolete 3 2 |
25 |
25 |
26 |
26 |
27 Test that obsolete changeset are hidden |
27 Test that obsolete changeset are hidden |
28 |
28 |
29 $ hg log |
29 $ qlog |
30 changeset: 3:0d3f46688ccc |
30 3 0d3f46688ccc |
31 tag: tip |
31 1 7c3bad9141dc |
32 parent: 1:7c3bad9141dc |
32 0 1f0dee641bb7 |
33 user: test |
33 $ qlog --hidden |
34 date: Thu Jan 01 00:00:00 1970 +0000 |
34 3 0d3f46688ccc |
35 summary: add obsol_c |
35 2 4538525df7e2 |
36 |
36 1 7c3bad9141dc |
37 changeset: 1:7c3bad9141dc |
37 0 1f0dee641bb7 |
38 user: test |
38 $ qlog -r 'obsolete()' --hidden |
39 date: Thu Jan 01 00:00:00 1970 +0000 |
39 2 4538525df7e2 |
40 summary: add b |
|
41 |
|
42 changeset: 0:1f0dee641bb7 |
|
43 user: test |
|
44 date: Thu Jan 01 00:00:00 1970 +0000 |
|
45 summary: add a |
|
46 |
|
47 $ hg log --hidden |
|
48 changeset: 3:0d3f46688ccc |
|
49 tag: tip |
|
50 parent: 1:7c3bad9141dc |
|
51 user: test |
|
52 date: Thu Jan 01 00:00:00 1970 +0000 |
|
53 summary: add obsol_c |
|
54 |
|
55 changeset: 2:4538525df7e2 |
|
56 user: test |
|
57 date: Thu Jan 01 00:00:00 1970 +0000 |
|
58 summary: add c |
|
59 |
|
60 changeset: 1:7c3bad9141dc |
|
61 user: test |
|
62 date: Thu Jan 01 00:00:00 1970 +0000 |
|
63 summary: add b |
|
64 |
|
65 changeset: 0:1f0dee641bb7 |
|
66 user: test |
|
67 date: Thu Jan 01 00:00:00 1970 +0000 |
|
68 summary: add a |
|
69 |
|
70 $ hg log -r 'obsolete()' --hidden |
|
71 changeset: 2:4538525df7e2 |
|
72 user: test |
|
73 date: Thu Jan 01 00:00:00 1970 +0000 |
|
74 summary: add c |
|
75 |
|
76 |
40 |
77 test obsolete changeset with no-obsolete descendant |
41 test obsolete changeset with no-obsolete descendant |
78 $ hg up 1 -q |
42 $ hg up 1 -q |
79 $ mkcommit "obsol_c'" # 4 (on 1) |
43 $ mkcommit "obsol_c'" # 4 (on 1) |
80 created new head |
44 created new head |
81 $ hg debugobsolete 4 3 |
45 $ hg debugobsolete 4 3 |
82 $ hg log |
46 $ qlog |
83 changeset: 4:725c380fe99b |
47 4 725c380fe99b |
84 tag: tip |
48 1 7c3bad9141dc |
85 parent: 1:7c3bad9141dc |
49 0 1f0dee641bb7 |
86 user: test |
50 $ qlog -r 'obsolete()' --hidden |
87 date: Thu Jan 01 00:00:00 1970 +0000 |
51 2 4538525df7e2 |
88 summary: add obsol_c' |
52 3 0d3f46688ccc |
89 |
|
90 changeset: 1:7c3bad9141dc |
|
91 user: test |
|
92 date: Thu Jan 01 00:00:00 1970 +0000 |
|
93 summary: add b |
|
94 |
|
95 changeset: 0:1f0dee641bb7 |
|
96 user: test |
|
97 date: Thu Jan 01 00:00:00 1970 +0000 |
|
98 summary: add a |
|
99 |
|
100 $ hg log -r 'obsolete()' --hidden |
|
101 changeset: 2:4538525df7e2 |
|
102 user: test |
|
103 date: Thu Jan 01 00:00:00 1970 +0000 |
|
104 summary: add c |
|
105 |
|
106 changeset: 3:0d3f46688ccc |
|
107 parent: 1:7c3bad9141dc |
|
108 user: test |
|
109 date: Thu Jan 01 00:00:00 1970 +0000 |
|
110 summary: add obsol_c |
|
111 |
|
112 $ hg up 3 -q |
53 $ hg up 3 -q |
113 $ mkcommit d # 5 (on 3) |
54 $ mkcommit d # 5 (on 3) |
114 $ hg log -r 'obsolete()' |
55 $ qlog -r 'obsolete()' |
115 changeset: 3:0d3f46688ccc |
56 3 0d3f46688ccc |
116 parent: 1:7c3bad9141dc |
|
117 user: test |
|
118 date: Thu Jan 01 00:00:00 1970 +0000 |
|
119 summary: add obsol_c |
|
120 |
|
121 |
57 |
122 Test communication of obsolete relation with a compatible client |
58 Test communication of obsolete relation with a compatible client |
123 |
59 |
124 $ hg init ../other-new |
60 $ hg init ../other-new |
125 $ hg push ../other-new |
61 $ hg push ../other-new |
127 searching for changes |
63 searching for changes |
128 adding changesets |
64 adding changesets |
129 adding manifests |
65 adding manifests |
130 adding file changes |
66 adding file changes |
131 added 6 changesets with 6 changes to 6 files (+2 heads) |
67 added 6 changesets with 6 changes to 6 files (+2 heads) |
132 $ hg -R ../other-new log -r 'obsolete()' |
68 $ qlog -R ../other-new -r 'obsolete()' |
133 changeset: 3:0d3f46688ccc |
69 3 0d3f46688ccc |
134 parent: 1:7c3bad9141dc |
70 $ qlog -R ../other-new |
135 user: test |
71 5 a7a6f2b5d8a5 |
136 date: Thu Jan 01 00:00:00 1970 +0000 |
72 4 725c380fe99b |
137 summary: add obsol_c |
73 3 0d3f46688ccc |
138 |
74 1 7c3bad9141dc |
139 $ hg -R ../other-new log |
75 0 1f0dee641bb7 |
140 changeset: 5:a7a6f2b5d8a5 |
|
141 tag: tip |
|
142 parent: 3:0d3f46688ccc |
|
143 user: test |
|
144 date: Thu Jan 01 00:00:00 1970 +0000 |
|
145 summary: add d |
|
146 |
|
147 changeset: 4:725c380fe99b |
|
148 parent: 1:7c3bad9141dc |
|
149 user: test |
|
150 date: Thu Jan 01 00:00:00 1970 +0000 |
|
151 summary: add obsol_c' |
|
152 |
|
153 changeset: 3:0d3f46688ccc |
|
154 parent: 1:7c3bad9141dc |
|
155 user: test |
|
156 date: Thu Jan 01 00:00:00 1970 +0000 |
|
157 summary: add obsol_c |
|
158 |
|
159 changeset: 1:7c3bad9141dc |
|
160 user: test |
|
161 date: Thu Jan 01 00:00:00 1970 +0000 |
|
162 summary: add b |
|
163 |
|
164 changeset: 0:1f0dee641bb7 |
|
165 user: test |
|
166 date: Thu Jan 01 00:00:00 1970 +0000 |
|
167 summary: add a |
|
168 |
|
169 $ hg up 3 -q |
76 $ hg up 3 -q |
170 $ mkcommit obsol_d # 6 |
77 $ mkcommit obsol_d # 6 |
171 created new head |
78 created new head |
172 $ hg debugobsolete 6 5 |
79 $ hg debugobsolete 6 5 |
173 $ qlog |
80 $ qlog |
174 6 |
81 6 95de7fc6918d |
175 4 |
82 4 725c380fe99b |
176 3 |
83 3 0d3f46688ccc |
177 1 |
84 1 7c3bad9141dc |
178 0 |
85 0 1f0dee641bb7 |
179 $ qlog -r 'obsolete()' |
86 $ qlog -r 'obsolete()' |
180 3 |
87 3 0d3f46688ccc |
181 $ hg push ../other-new -f # XXX should not have to use -f |
88 $ hg push ../other-new -f # XXX should not have to use -f |
182 pushing to ../other-new |
89 pushing to ../other-new |
183 searching for changes |
90 searching for changes |
184 adding changesets |
91 adding changesets |
185 adding manifests |
92 adding manifests |
186 adding file changes |
93 adding file changes |
187 added 1 changesets with 1 changes to 1 files (+1 heads) |
94 added 1 changesets with 1 changes to 1 files (+1 heads) |
188 $ qlog -R ../other-new |
95 $ qlog -R ../other-new |
189 6 |
96 6 95de7fc6918d |
190 4 |
97 4 725c380fe99b |
191 3 |
98 3 0d3f46688ccc |
192 1 |
99 1 7c3bad9141dc |
193 0 |
100 0 1f0dee641bb7 |
194 $ qlog -R ../other-new -r 'obsolete()' |
101 $ qlog -R ../other-new -r 'obsolete()' |
195 3 |
102 3 0d3f46688ccc |
196 $ hg up -q .^ |
103 $ hg up -q .^ |
197 $ mkcommit "obsol_d'" # 7 |
104 $ mkcommit "obsol_d'" # 7 |
198 created new head |
105 created new head |
199 $ hg debugobsolete 7 6 |
106 $ hg debugobsolete 7 6 |
200 $ hg pull -R ../other-new . |
107 $ hg pull -R ../other-new . |