equal
deleted
inserted
replaced
32 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (*) {'ef1': '1', 'user': 'test'} (glob) |
32 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (*) {'ef1': '1', 'user': 'test'} (glob) |
33 $ hg obslog . |
33 $ hg obslog . |
34 @ fdf9bde5129a (2) A1 |
34 @ fdf9bde5129a (2) A1 |
35 | |
35 | |
36 x 471f378eab4c (1) A0 |
36 x 471f378eab4c (1) A0 |
37 rewritten(description) by test (*) as fdf9bde5129a (glob) |
37 rewritten(description) as fdf9bde5129a by test (*) (glob) |
|
38 |
|
39 $ hg log --hidden -r "desc(A0)" |
|
40 changeset: 1:471f378eab4c |
|
41 user: test |
|
42 date: Thu Jan 01 00:00:00 1970 +0000 |
|
43 summary: A0 |
38 |
44 |
39 |
45 |
40 amend touching the user only |
46 amend touching the user only |
41 ---------------------------- |
47 ---------------------------- |
42 |
48 |
49 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (*) {'ef1': '16', 'user': 'test'} (glob) |
55 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (*) {'ef1': '16', 'user': 'test'} (glob) |
50 $ hg obslog . |
56 $ hg obslog . |
51 @ 5485c92d3433 (4) B0 |
57 @ 5485c92d3433 (4) B0 |
52 | |
58 | |
53 x ef4a313b1e0a (3) B0 |
59 x ef4a313b1e0a (3) B0 |
54 rewritten(user) by test (*) as 5485c92d3433 (glob) |
60 rewritten(user) as 5485c92d3433 by test (*) (glob) |
|
61 |
|
62 $ hg log --hidden -r "ef4a313b1e0a" |
|
63 changeset: 3:ef4a313b1e0a |
|
64 user: test |
|
65 date: Thu Jan 01 00:00:00 1970 +0000 |
|
66 summary: B0 |
55 |
67 |
56 |
68 |
57 amend touching the date only |
69 amend touching the date only |
58 ---------------------------- |
70 ---------------------------- |
59 |
71 |
66 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (*) {'ef1': '32', 'user': 'test'} (glob) |
78 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (*) {'ef1': '32', 'user': 'test'} (glob) |
67 $ hg obslog . |
79 $ hg obslog . |
68 @ 4dd84345082e (6) B1 |
80 @ 4dd84345082e (6) B1 |
69 | |
81 | |
70 x 2ef0680ff450 (5) B1 |
82 x 2ef0680ff450 (5) B1 |
71 rewritten(date) by test (*) as 4dd84345082e (glob) |
83 rewritten(date) as 4dd84345082e by test (*) (glob) |
|
84 |
|
85 $ hg log --hidden -r "2ef0680ff450" |
|
86 changeset: 5:2ef0680ff450 |
|
87 user: test |
|
88 date: Thu Jan 01 00:00:00 1970 +0000 |
|
89 summary: B1 |
72 |
90 |
73 |
91 |
74 amend touching the branch only |
92 amend touching the branch only |
75 ---------------------------- |
93 ---------------------------- |
76 |
94 |
87 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (*) {'ef1': '64', 'user': 'test'} (glob) |
105 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (*) {'ef1': '64', 'user': 'test'} (glob) |
88 $ hg obslog . |
106 $ hg obslog . |
89 @ 14a01456e057 (9) B2 |
107 @ 14a01456e057 (9) B2 |
90 | |
108 | |
91 x bd3db8264cee (7) B2 |
109 x bd3db8264cee (7) B2 |
92 rewritten(branch) by test (*) as 14a01456e057 (glob) |
110 rewritten(branch) as 14a01456e057 by test (*) (glob) |
|
111 |
|
112 $ hg log --hidden -r "bd3db8264cee" |
|
113 changeset: 7:bd3db8264cee |
|
114 user: test |
|
115 date: Thu Jan 01 00:00:00 1970 +0000 |
|
116 summary: B2 |
93 |
117 |
94 |
118 |
95 $ hg up default |
119 $ hg up default |
96 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
120 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
97 |
121 |
109 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
133 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
110 $ hg obslog . |
134 $ hg obslog . |
111 @ da86aa2f19a3 (12) D0 |
135 @ da86aa2f19a3 (12) D0 |
112 | |
136 | |
113 x c85eff83a034 (11) D0 |
137 x c85eff83a034 (11) D0 |
114 rewritten(parent) by test (*) as da86aa2f19a3 (glob) |
138 rewritten(parent) as da86aa2f19a3 by test (*) (glob) |
|
139 |
|
140 $ hg log --hidden -r "c85eff83a034" |
|
141 changeset: 11:c85eff83a034 |
|
142 user: test |
|
143 date: Thu Jan 01 00:00:00 1970 +0000 |
|
144 summary: D0 |
115 |
145 |
116 |
146 |
117 amend touching the diff |
147 amend touching the diff |
118 ----------------------- |
148 ----------------------- |
119 |
149 |
128 ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
158 ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
129 $ hg obslog . |
159 $ hg obslog . |
130 @ 75781fdbdbf5 (15) E0 |
160 @ 75781fdbdbf5 (15) E0 |
131 | |
161 | |
132 x ebfe0333e0d9 (13) E0 |
162 x ebfe0333e0d9 (13) E0 |
133 rewritten(content) by test (*) as 75781fdbdbf5 (glob) |
163 rewritten(content) as 75781fdbdbf5 by test (*) (glob) |
|
164 |
|
165 $ hg log --hidden -r "ebfe0333e0d9" |
|
166 changeset: 13:ebfe0333e0d9 |
|
167 user: test |
|
168 date: Thu Jan 01 00:00:00 1970 +0000 |
|
169 summary: E0 |
134 |
170 |
135 |
171 |
136 amend with multiple effect (desc and meta) |
172 amend with multiple effect (desc and meta) |
137 ------------------------------------------- |
173 ------------------------------------------- |
138 |
174 |
148 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (*) {'ef1': '113', 'user': 'test'} (glob) |
184 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (*) {'ef1': '113', 'user': 'test'} (glob) |
149 $ hg obslog . |
185 $ hg obslog . |
150 @ a94e0fd5f1c8 (18) F1 |
186 @ a94e0fd5f1c8 (18) F1 |
151 | |
187 | |
152 x fad47e5bd78e (16) F0 |
188 x fad47e5bd78e (16) F0 |
153 rewritten(description, user, date, branch) by test (*) as a94e0fd5f1c8 (glob) |
189 rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (*) (glob) |
154 |
190 |
|
191 $ hg log --hidden -r "fad47e5bd78e" |
|
192 changeset: 16:fad47e5bd78e |
|
193 user: test |
|
194 date: Thu Jan 01 00:00:00 1970 +0000 |
|
195 summary: F0 |
|
196 |
|
197 |
155 rebase not touching the diff |
198 rebase not touching the diff |
156 ---------------------------- |
199 ---------------------------- |
157 |
200 |
158 $ cat << EOF > H0 |
201 $ cat << EOF > H0 |
159 > 0 |
202 > 0 |
195 merging H0 |
238 merging H0 |
196 $ hg obslog tip |
239 $ hg obslog tip |
197 o e509e2eb3df5 (22) H1 |
240 o e509e2eb3df5 (22) H1 |
198 | |
241 | |
199 x b57fed8d8322 (20) H1 |
242 x b57fed8d8322 (20) H1 |
200 rewritten(parent) by test (*) as e509e2eb3df5 (glob) |
243 rewritten(parent) as e509e2eb3df5 by test (*) (glob) |
|
244 |
|
245 $ hg log --hidden -r "b57fed8d8322" |
|
246 changeset: 20:b57fed8d8322 |
|
247 branch: my-other-branch |
|
248 user: test |
|
249 date: Thu Jan 01 00:00:00 1970 +0000 |
|
250 summary: H1 |
201 |
251 |
202 amend closing the branch should be detected as meta change |
252 amend closing the branch should be detected as meta change |
203 ---------------------------------------------------------- |
253 ---------------------------------------------------------- |
204 |
254 |
205 $ hg branch closedbranch |
255 $ hg branch closedbranch |
212 |
262 |
213 $ hg obslog . |
263 $ hg obslog . |
214 @ 12c6238b5e37 (26) I0 |
264 @ 12c6238b5e37 (26) I0 |
215 | |
265 | |
216 x 2f599e54c1c6 (24) I0 |
266 x 2f599e54c1c6 (24) I0 |
217 rewritten(meta) by test (*) as 12c6238b5e37 (glob) |
267 rewritten(meta) as 12c6238b5e37 by test (*) (glob) |
218 |
268 |
|
269 $ hg log --hidden -r "2f599e54c1c6" |
|
270 changeset: 24:2f599e54c1c6 |
|
271 branch: closedbranch |
|
272 user: test |
|
273 date: Thu Jan 01 00:00:00 1970 +0000 |
|
274 summary: I0 |
|
275 |