tests/test-convert-filemap.t
changeset 23835 aa4a1672583e
parent 21054 fffa9f17c3ef
child 24216 4bb348ae43cb
equal deleted inserted replaced
23834:bf07c19b4c82 23835:aa4a1672583e
   635   
   635   
   636 
   636 
   637   $ cd namedbranch
   637   $ cd namedbranch
   638   $ hg --config extensions.mq= strip tip
   638   $ hg --config extensions.mq= strip tip
   639   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   639   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   640   saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-backup.hg (glob)
   640   saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-92adf160-backup.hg (glob)
   641   $ hg up foo
   641   $ hg up foo
   642   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   642   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   643   $ hg merge default
   643   $ hg merge default
   644   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   644   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   645   (branch merge, don't forget to commit)
   645   (branch merge, don't forget to commit)