Mercurial > evolve-talk
changeset 24:e5212a155140
Add second evolve session
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Sun, 09 Mar 2014 19:53:38 -0400 |
parents | ba454c7497f6 |
children | 756d0a23f1a5 |
files | evolve-session |
diffstat | 1 files changed, 26 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/evolve-session Sun Mar 09 19:52:49 2014 -0400 +++ b/evolve-session Sun Mar 09 19:53:38 2014 -0400 @@ -49,4 +49,29 @@ !RET -!RET \ No newline at end of file +# Clone repo again... +hg clone http://hg.python.org/coc/ ../coc-other +hg push -B jordi -B upstream ../coc-other + +# Let's see here... +hg log -G --hidden +cd ../coc-other +hg log -G --hidden +hg update jordi + +# Fold both commits into one +hg fold jordi jordi^ "Rename the Python CoC to the Cobra CoC" +hg log -G +hg book jordi ## sorry, this is a bug, Evolve is still evolving ;-) +hg log -G + +hg log -pvr jordi + +# Return +cd ../coc +hg pull ../coc-other +hg log -G +hg evolve --all +hg log -G + +!RET