comparison tests/test-evolve.t @ 219:cfdab01ca8a0

evolve-amend: properly handle amending file renames and additions.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 02 May 2012 14:08:21 +0200
parents dea67dae27a4
children 6c6bb7a23bb5
comparison
equal deleted inserted replaced
218:ace5608350b6 219:cfdab01ca8a0
295 $ hg add A 295 $ hg add A
296 $ hg commit -m 'adding A' 296 $ hg commit -m 'adding A'
297 $ hg mv A B 297 $ hg mv A B
298 $ echo '.' >> B 298 $ echo '.' >> B
299 $ hg amend -m 'add B' 299 $ hg amend -m 'add B'
300 $ hg verify
301 checking changesets
302 checking manifests
303 crosschecking files in changesets and manifests
304 checking files
305 3 files, 4 changesets, 4 total revisions
306 $ hg --config extensions.hgext.mq= strip 'extinct()'
307 saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg
308 $ hg verify
309 checking changesets
310 checking manifests
311 crosschecking files in changesets and manifests
312 checking files
313 2 files, 2 changesets, 2 total revisions
300 $ cd .. 314 $ cd ..
301 315
302 Clone just this branch 316 Clone just this branch
303 317
304 $ cd beta 318 $ cd beta