Mercurial > evolve-talk
comparison evolve-session @ 28:6d26dce723a4
Remove bogus workaround; this isn't necessary thanks to "hg update jordi"
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Tue, 11 Mar 2014 16:02:50 -0400 |
parents | e5212a155140 |
children | ef6b19e38ecd |
comparison
equal
deleted
inserted
replaced
27:f83926dd97f1 | 28:6d26dce723a4 |
---|---|
60 hg update jordi | 60 hg update jordi |
61 | 61 |
62 # Fold both commits into one | 62 # Fold both commits into one |
63 hg fold jordi jordi^ "Rename the Python CoC to the Cobra CoC" | 63 hg fold jordi jordi^ "Rename the Python CoC to the Cobra CoC" |
64 hg log -G | 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 | 65 hg log -pvr jordi |
69 | 66 |
70 # Return | 67 # Return |
71 cd ../coc | 68 cd ../coc |
72 hg pull ../coc-other | 69 hg pull ../coc-other |