equal
deleted
inserted
replaced
160 $ hg status -C |
160 $ hg status -C |
161 A b.txt |
161 A b.txt |
162 R a.txt |
162 R a.txt |
163 $ hg commit --amend -m 'amended' |
163 $ hg commit --amend -m 'amended' |
164 detected move of 1 files |
164 detected move of 1 files |
165 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend-backup.hg (glob) |
165 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob) |
166 $ hg status --change . -C |
166 $ hg status --change . -C |
167 A b.txt |
167 A b.txt |
168 a.txt |
168 a.txt |
169 A c.txt |
169 A c.txt |
170 R a.txt |
170 R a.txt |
183 $ hg status -C |
183 $ hg status -C |
184 A b.txt |
184 A b.txt |
185 R a.txt |
185 R a.txt |
186 $ hg commit --amend -m 'amended' |
186 $ hg commit --amend -m 'amended' |
187 detected move of 1 files |
187 detected move of 1 files |
188 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend-backup.hg (glob) |
188 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob) |
189 $ hg status --change . -C |
189 $ hg status --change . -C |
190 A b.txt |
190 A b.txt |
191 a.txt |
191 a.txt |
192 A c.txt |
192 A c.txt |
193 R a.txt |
193 R a.txt |
205 $ printf '\nfoo\n' >> b.txt |
205 $ printf '\nfoo\n' >> b.txt |
206 $ hg status -C |
206 $ hg status -C |
207 A b.txt |
207 A b.txt |
208 R a.txt |
208 R a.txt |
209 $ hg commit --amend -m 'amended' |
209 $ hg commit --amend -m 'amended' |
210 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend-backup.hg (glob) |
210 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob) |
211 $ hg status --change . -C |
211 $ hg status --change . -C |
212 A b.txt |
212 A b.txt |
213 A c.txt |
213 A c.txt |
214 R a.txt |
214 R a.txt |
215 $ hg up -r 0 |
215 $ hg up -r 0 |
227 $ hg status -C |
227 $ hg status -C |
228 A b.txt |
228 A b.txt |
229 R a.txt |
229 R a.txt |
230 $ hg commit --amend --config automv.similarity='60' -m 'amended' |
230 $ hg commit --amend --config automv.similarity='60' -m 'amended' |
231 detected move of 1 files |
231 detected move of 1 files |
232 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend-backup.hg (glob) |
232 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob) |
233 $ hg status --change . -C |
233 $ hg status --change . -C |
234 A b.txt |
234 A b.txt |
235 a.txt |
235 a.txt |
236 A c.txt |
236 A c.txt |
237 R a.txt |
237 R a.txt |
246 $ mv a.txt b.txt |
246 $ mv a.txt b.txt |
247 $ hg status -C |
247 $ hg status -C |
248 ! a.txt |
248 ! a.txt |
249 ? b.txt |
249 ? b.txt |
250 $ hg commit --amend -m 'amended' |
250 $ hg commit --amend -m 'amended' |
251 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend-backup.hg (glob) |
251 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob) |
252 $ hg status -C |
252 $ hg status -C |
253 ! a.txt |
253 ! a.txt |
254 ? b.txt |
254 ? b.txt |
255 $ hg up -Cr 0 |
255 $ hg up -Cr 0 |
256 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
256 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
268 $ hg status -C |
268 $ hg status -C |
269 A b.txt |
269 A b.txt |
270 A d.txt |
270 A d.txt |
271 R a.txt |
271 R a.txt |
272 $ hg commit --amend -m 'amended' d.txt |
272 $ hg commit --amend -m 'amended' d.txt |
273 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend-backup.hg (glob) |
273 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob) |
274 $ hg status --change . -C |
274 $ hg status --change . -C |
275 A c.txt |
275 A c.txt |
276 A d.txt |
276 A d.txt |
277 $ hg status -C |
277 $ hg status -C |
278 A b.txt |
278 A b.txt |
279 R a.txt |
279 R a.txt |
280 $ hg commit --amend -m 'amended' |
280 $ hg commit --amend -m 'amended' |
281 detected move of 1 files |
281 detected move of 1 files |
282 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend-backup.hg (glob) |
282 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob) |
283 $ hg status --change . -C |
283 $ hg status --change . -C |
284 A b.txt |
284 A b.txt |
285 a.txt |
285 a.txt |
286 A c.txt |
286 A c.txt |
287 A d.txt |
287 A d.txt |
299 $ hg add b.txt |
299 $ hg add b.txt |
300 $ hg status -C |
300 $ hg status -C |
301 A b.txt |
301 A b.txt |
302 R a.txt |
302 R a.txt |
303 $ hg commit --amend -m 'amended' --no-automv |
303 $ hg commit --amend -m 'amended' --no-automv |
304 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend-backup.hg (glob) |
304 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob) |
305 $ hg status --change . -C |
305 $ hg status --change . -C |
306 A b.txt |
306 A b.txt |
307 A c.txt |
307 A c.txt |
308 R a.txt |
308 R a.txt |
309 $ hg up -r 0 |
309 $ hg up -r 0 |
320 R a.txt |
320 R a.txt |
321 ? b.txt |
321 ? b.txt |
322 $ hg commit -m "removed a" |
322 $ hg commit -m "removed a" |
323 $ hg add b.txt |
323 $ hg add b.txt |
324 $ hg commit --amend -m 'amended' |
324 $ hg commit --amend -m 'amended' |
325 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend-backup.hg (glob) |
325 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-amend.hg (glob) |
326 $ hg status --change . -C |
326 $ hg status --change . -C |
327 A b.txt |
327 A b.txt |
328 R a.txt |
328 R a.txt |
329 |
329 |
330 error conditions |
330 error conditions |