Mercurial > evolve-talk

comparison evolve-session @ 24:e5212a155140

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add second evolve session
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Sun, 09 Mar 2014 19:53:38 -0400
parents ba454c7497f6
children 6d26dce723a4
comparison
equal deleted inserted replaced
23:ba454c7497f6 24:e5212a155140
47 # What if we try to drop an old commit? 47 # What if we try to drop an old commit?
48 hg prune -r upstream 48 hg prune -r upstream
49 49
50 !RET 50 !RET
51 51
52 # Clone repo again...
53 hg clone http://hg.python.org/coc/ ../coc-other
54 hg push -B jordi -B upstream ../coc-other
55
56 # Let's see here...
57 hg log -G --hidden
58 cd ../coc-other
59 hg log -G --hidden
60 hg update jordi
61
62 # Fold both commits into one
63 hg fold jordi jordi^ "Rename the Python CoC to the Cobra CoC"
64 hg log -G
65 hg book jordi ## sorry, this is a bug, Evolve is still evolving ;-)
66 hg log -G
67
68 hg log -pvr jordi
69
70 # Return
71 cd ../coc
72 hg pull ../coc-other
73 hg log -G
74 hg evolve --all
75 hg log -G
76
52 !RET 77 !RET