tests/test-evolve.t
branchstable
changeset 1735 8f902ec9ed9a
parent 1710 aec233d3cafd
child 1736 c9a79b432907
equal deleted inserted replaced
1718:54f40b722cf9 1735:8f902ec9ed9a
   375   
   375   
   376   $ hg evolve --any --traceback --bumped
   376   $ hg evolve --any --traceback --bumped
   377   recreate:[8] another feature that rox
   377   recreate:[8] another feature that rox
   378   atop:[7] another feature (child of ba0ec09b1bab)
   378   atop:[7] another feature (child of ba0ec09b1bab)
   379   computing new diff
   379   computing new diff
   380   committed as 2d8c5414e9f0
   380   committed as 6707c5e1c49d
   381   working directory is now at 2d8c5414e9f0
   381   working directory is now at 6707c5e1c49d
   382   $ hg glog
   382   $ hg glog
   383   @  9	feature-B: bumped update to 99833d22b0c6: - test
   383   @  9	feature-B: bumped update to 99833d22b0c6: - test
   384   |
   384   |
   385   o  7	: another feature (child of ba0ec09b1bab) - test
   385   o  7	: another feature (child of ba0ec09b1bab) - test
   386   |
   386   |
   435   atop:[13] dansk!
   435   atop:[13] dansk!
   436   merging main-file-1
   436   merging main-file-1
   437   move:[11] dansk 3!
   437   move:[11] dansk 3!
   438   atop:[14] dansk 2!
   438   atop:[14] dansk 2!
   439   merging main-file-1
   439   merging main-file-1
   440   working directory is now at 536984593824
   440   working directory is now at 68557e4f0048
   441   $ hg glog
   441   $ hg glog
   442   @  15	: dansk 3! - test
   442   @  15	: dansk 3! - test
   443   |
   443   |
   444   o  14	: dansk 2! - test
   444   o  14	: dansk 2! - test
   445   |
   445   |
   808   $ cd ../work
   808   $ cd ../work
   809   $ hg fold .^ --message "Folding with custom commit message"
   809   $ hg fold .^ --message "Folding with custom commit message"
   810   2 changesets folded
   810   2 changesets folded
   811   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   811   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   812   $ glog
   812   $ glog
   813   @  16:d1297ecc971f@default(draft) Folding with custom commit message
   813   @  16:98cb758db56d@default(draft) Folding with custom commit message
   814   |
   814   |
   815   o  13:27b934eaf1f9@default(draft) dansk!
   815   o  13:0a2f9b959bb4@default(draft) dansk!
   816   |
   816   |
   817   o  7:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
   817   o  7:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
   818   |
   818   |
   819   o  6:ba0ec09b1bab@default(public) a nifty feature
   819   o  6:ba0ec09b1bab@default(public) a nifty feature
   820   |
   820   |
   827 
   827 
   828   $ hg fold .^ --logfile commit-message
   828   $ hg fold .^ --logfile commit-message
   829   2 changesets folded
   829   2 changesets folded
   830   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   830   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   831   $ hg qlog
   831   $ hg qlog
   832   17 - 0b1eca0e871b A longer
   832   17 - a00182c58888 A longer
   833                     commit message (draft)
   833                     commit message (draft)
   834   7 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
   834   7 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
   835   6 - ba0ec09b1bab a nifty feature (public)
   835   6 - ba0ec09b1bab a nifty feature (public)
   836   0 - e55e0562ee93 base (public)
   836   0 - e55e0562ee93 base (public)
   837 
   837