30 |
30 |
31 $ hg debugobsolete --rev . |
31 $ hg debugobsolete --rev . |
32 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
32 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
33 $ hg obslog . |
33 $ hg obslog . |
34 @ fdf9bde5129a (2) A1 |
34 @ fdf9bde5129a (2) A1 |
|
35 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
35 | |
36 | |
36 x 471f378eab4c (1) A0 |
37 x 471f378eab4c (1) A0 |
37 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
38 |
38 |
39 $ hg log --hidden -r "desc(A0)" |
39 $ hg log --hidden -r "desc(A0)" |
40 changeset: 1:471f378eab4c |
40 changeset: 1:471f378eab4c |
41 user: test |
41 user: test |
42 date: Thu Jan 01 00:00:00 1970 +0000 |
42 date: Thu Jan 01 00:00:00 1970 +0000 |
54 |
54 |
55 $ hg debugobsolete --rev . |
55 $ hg debugobsolete --rev . |
56 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '16', 'operation': 'amend', 'user': 'test'} |
56 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '16', 'operation': 'amend', 'user': 'test'} |
57 $ hg obslog . |
57 $ hg obslog . |
58 @ 5485c92d3433 (4) B0 |
58 @ 5485c92d3433 (4) B0 |
|
59 | reauthored(user) from ef4a313b1e0a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
59 | |
60 | |
60 x ef4a313b1e0a (3) B0 |
61 x ef4a313b1e0a (3) B0 |
61 reauthored(user) as 5485c92d3433 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
62 |
62 |
63 $ hg log --hidden -r "ef4a313b1e0a" |
63 $ hg log --hidden -r "ef4a313b1e0a" |
64 changeset: 3:ef4a313b1e0a |
64 changeset: 3:ef4a313b1e0a |
65 user: test |
65 user: test |
66 date: Thu Jan 01 00:00:00 1970 +0000 |
66 date: Thu Jan 01 00:00:00 1970 +0000 |
78 |
78 |
79 $ hg debugobsolete --rev . |
79 $ hg debugobsolete --rev . |
80 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'amend', 'user': 'test'} |
80 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'amend', 'user': 'test'} |
81 $ hg obslog . |
81 $ hg obslog . |
82 @ 4dd84345082e (6) B1 |
82 @ 4dd84345082e (6) B1 |
|
83 | date-changed(date) from 2ef0680ff450 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
83 | |
84 | |
84 x 2ef0680ff450 (5) B1 |
85 x 2ef0680ff450 (5) B1 |
85 date-changed(date) as 4dd84345082e using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
86 |
86 |
87 $ hg log --hidden -r "2ef0680ff450" |
87 $ hg log --hidden -r "2ef0680ff450" |
88 changeset: 5:2ef0680ff450 |
88 changeset: 5:2ef0680ff450 |
89 user: test |
89 user: test |
90 date: Thu Jan 01 00:00:00 1970 +0000 |
90 date: Thu Jan 01 00:00:00 1970 +0000 |
105 |
105 |
106 $ hg debugobsolete --rev . |
106 $ hg debugobsolete --rev . |
107 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '64', 'operation': 'amend', 'user': 'test'} |
107 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '64', 'operation': 'amend', 'user': 'test'} |
108 $ hg obslog . |
108 $ hg obslog . |
109 @ 14a01456e057 (8) B2 |
109 @ 14a01456e057 (8) B2 |
|
110 | branch-changed(branch) from bd3db8264cee using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
110 | |
111 | |
111 x bd3db8264cee (7) B2 |
112 x bd3db8264cee (7) B2 |
112 branch-changed(branch) as 14a01456e057 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
113 |
113 |
114 $ hg log --hidden -r "bd3db8264cee" |
114 $ hg log --hidden -r "bd3db8264cee" |
115 changeset: 7:bd3db8264cee |
115 changeset: 7:bd3db8264cee |
116 user: test |
116 user: test |
117 date: Thu Jan 01 00:00:00 1970 +0000 |
117 date: Thu Jan 01 00:00:00 1970 +0000 |
134 |
134 |
135 $ hg debugobsolete --rev . |
135 $ hg debugobsolete --rev . |
136 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
136 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
137 $ hg obslog . |
137 $ hg obslog . |
138 @ da86aa2f19a3 (11) D0 |
138 @ da86aa2f19a3 (11) D0 |
|
139 | rebased(parent) from c85eff83a034 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
139 | |
140 | |
140 x c85eff83a034 (10) D0 |
141 x c85eff83a034 (10) D0 |
141 rebased(parent) as da86aa2f19a3 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
|
142 |
142 |
143 $ hg log --hidden -r "c85eff83a034" |
143 $ hg log --hidden -r "c85eff83a034" |
144 changeset: 10:c85eff83a034 |
144 changeset: 10:c85eff83a034 |
145 user: test |
145 user: test |
146 date: Thu Jan 01 00:00:00 1970 +0000 |
146 date: Thu Jan 01 00:00:00 1970 +0000 |
159 |
159 |
160 $ hg debugobsolete --rev . |
160 $ hg debugobsolete --rev . |
161 ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
161 ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
162 $ hg obslog . |
162 $ hg obslog . |
163 @ 75781fdbdbf5 (13) E0 |
163 @ 75781fdbdbf5 (13) E0 |
|
164 | amended(content) from ebfe0333e0d9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
164 | |
165 | |
165 x ebfe0333e0d9 (12) E0 |
166 x ebfe0333e0d9 (12) E0 |
166 amended(content) as 75781fdbdbf5 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
167 |
167 |
168 $ hg log --hidden -r "ebfe0333e0d9" |
168 $ hg log --hidden -r "ebfe0333e0d9" |
169 changeset: 12:ebfe0333e0d9 |
169 changeset: 12:ebfe0333e0d9 |
170 user: test |
170 user: test |
171 date: Thu Jan 01 00:00:00 1970 +0000 |
171 date: Thu Jan 01 00:00:00 1970 +0000 |
185 |
185 |
186 $ hg debugobsolete --rev . |
186 $ hg debugobsolete --rev . |
187 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '113', 'operation': 'amend', 'user': 'test'} |
187 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '113', 'operation': 'amend', 'user': 'test'} |
188 $ hg obslog . |
188 $ hg obslog . |
189 @ a94e0fd5f1c8 (15) F1 |
189 @ a94e0fd5f1c8 (15) F1 |
|
190 | rewritten(description, user, date, branch) from fad47e5bd78e using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
190 | |
191 | |
191 x fad47e5bd78e (14) F0 |
192 x fad47e5bd78e (14) F0 |
192 rewritten(description, user, date, branch) as a94e0fd5f1c8 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
193 |
193 |
194 $ hg log --hidden -r "fad47e5bd78e" |
194 $ hg log --hidden -r "fad47e5bd78e" |
195 changeset: 14:fad47e5bd78e |
195 changeset: 14:fad47e5bd78e |
196 user: test |
196 user: test |
197 date: Thu Jan 01 00:00:00 1970 +0000 |
197 date: Thu Jan 01 00:00:00 1970 +0000 |
238 $ hg commit -m "H2" |
238 $ hg commit -m "H2" |
239 created new head |
239 created new head |
240 $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3 |
240 $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3 |
241 rebasing 17:b57fed8d8322 "H1" |
241 rebasing 17:b57fed8d8322 "H1" |
242 merging H0 |
242 merging H0 |
|
243 $ hg debugobsolete |
|
244 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
245 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '16', 'operation': 'amend', 'user': 'test'} |
|
246 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'amend', 'user': 'test'} |
|
247 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '64', 'operation': 'amend', 'user': 'test'} |
|
248 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
249 ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
250 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '113', 'operation': 'amend', 'user': 'test'} |
|
251 b57fed8d83228a8ae3748d8c3760a77638dd4f8c e509e2eb3df5d131ff7c02350bf2a9edd0c09478 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
243 $ hg obslog tip |
252 $ hg obslog tip |
244 o e509e2eb3df5 (19) H1 |
253 o e509e2eb3df5 (19) H1 |
|
254 | rebased(parent) from b57fed8d8322 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
245 | |
255 | |
246 x b57fed8d8322 (17) H1 |
256 x b57fed8d8322 (17) H1 |
247 rebased(parent) as e509e2eb3df5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
|
248 |
257 |
249 $ hg log --hidden -r "b57fed8d8322" |
258 $ hg log --hidden -r "b57fed8d8322" |
250 changeset: 17:b57fed8d8322 |
259 changeset: 17:b57fed8d8322 |
251 branch: my-other-branch |
260 branch: my-other-branch |
252 user: test |
261 user: test |
265 |
274 |
266 check result |
275 check result |
267 |
276 |
268 $ hg obslog . |
277 $ hg obslog . |
269 @ 12c6238b5e37 (22) I0 |
278 @ 12c6238b5e37 (22) I0 |
|
279 | meta-changed(meta) from 2f599e54c1c6 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
270 | |
280 | |
271 x 2f599e54c1c6 (21) I0 |
281 x 2f599e54c1c6 (21) I0 |
272 meta-changed(meta) as 12c6238b5e37 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
273 |
282 |
274 $ hg log --hidden -r "2f599e54c1c6" |
283 $ hg log --hidden -r "2f599e54c1c6" |
275 changeset: 21:2f599e54c1c6 |
284 changeset: 21:2f599e54c1c6 |
276 branch: closedbranch |
285 branch: closedbranch |
277 user: test |
286 user: test |