Mercurial > evolve-talk
annotate evolve-session @ 30:3df93a421f8d
Add missing -m option to fold (TODO: patch evolve)
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Tue, 11 Mar 2014 16:55:28 -0400 |
parents | ef6b19e38ecd |
children |
rev | line source |
---|---|
9
39800c8f0532
Add initial session replay
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
1 # Let's grab the Python Code of Conduct and have a look |
39800c8f0532
Add initial session replay
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
2 hg clone http://hg.python.org/coc/ |
39800c8f0532
Add initial session replay
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
3 cd coc |
39800c8f0532
Add initial session replay
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
4 hg log -G |
10
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
5 ls |
9
39800c8f0532
Add initial session replay
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
6 |
39800c8f0532
Add initial session replay
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
7 # Now let's add a couple of bookmarks |
39800c8f0532
Add initial session replay
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
8 hg book upstream |
39800c8f0532
Add initial session replay
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
9 hg book jordi |
39800c8f0532
Add initial session replay
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
10 |
10
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
11 # And make two changes |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
12 fold -s -w 72 CodeOfConduct.rst > /tmp/coc && mv /tmp/coc CodeOfConduct.rst |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
13 sed -i 's/ $//' CodeOfConduct.rst |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
14 hg ci -m "Word-wrap CodeOfConduct" |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
15 sed -i 's/Python/Cobra/g' CodeOfConduct.rst |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
16 hg ci -m "Change Python's name to something much cooler" |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
17 |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
18 # Where were we? |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
19 hg log -G |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
20 hg diff -c 3 |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
21 |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
22 # Wait, Cobra is not a community |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
23 sed -i 's/community/command/g' CodeOfConduct.rst |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
24 hg ci -m "Cobra Command is not a community" |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
25 |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
26 hg log -G |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
27 |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
28 # Command should be capitalised |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
29 sed -i 's/command/Command/g' CodeOfConduct.rst |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
30 hg amend |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
31 |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
32 hg log -G |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
33 |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
34 # Wait, we forgot to update the README |
13
c48ed0e2ab41
Rename gup and gdown to next and previous
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
10
diff
changeset
|
35 hg prev |
10
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
36 hg log -G |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
37 sed -i "s/Python Software Foundation/Cobra Commander HQ/g" README |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
38 sed -i "s/PSF/CCHQ/g" README |
22
17b04830a301
Show README after editing it
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18
diff
changeset
|
39 cat README |
10
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
40 hg amend |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
41 |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
42 # What's this about unstable csets? |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
43 hg log -G |
29
ef6b19e38ecd
Change "hg evolve --all" to just "hg evolve" (TODO: patch evolve to behave this way)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
28
diff
changeset
|
44 hg evolve |
10
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
45 hg log -G |
80b765f69c5f
Define a basic session that shows off basic Evolve use
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
9
diff
changeset
|
46 |
14
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
47 # What if we try to drop an old commit? |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
48 hg prune -r upstream |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
49 |
23
ba454c7497f6
Remove hg next call, it's unnecessary
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22
diff
changeset
|
50 !RET |
14
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
51 |
24
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
52 # Clone repo again... |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
53 hg clone http://hg.python.org/coc/ ../coc-other |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
54 hg push -B jordi -B upstream ../coc-other |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
55 |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
56 # Let's see here... |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
57 hg log -G --hidden |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
58 cd ../coc-other |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
59 hg log -G --hidden |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
60 hg update jordi |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
61 |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
62 # Fold both commits into one |
30
3df93a421f8d
Add missing -m option to fold (TODO: patch evolve)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
29
diff
changeset
|
63 hg fold jordi jordi^ -m "Rename the Python CoC to the Cobra CoC" |
24
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
64 hg log -G |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
65 hg log -pvr jordi |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
66 |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
67 # Return |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
68 cd ../coc |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
69 hg pull ../coc-other |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
70 hg log -G |
29
ef6b19e38ecd
Change "hg evolve --all" to just "hg evolve" (TODO: patch evolve to behave this way)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
28
diff
changeset
|
71 hg evolve |
24
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
72 hg log -G |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
73 |
e5212a155140
Add second evolve session
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
23
diff
changeset
|
74 !RET |