Mercurial > hg-talk

annotate session2.sh @ 4:aa2b23a68003

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a few more hg log commands
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Thu, 06 Nov 2014 16:53:24 -0500
parents 624bfe6018f3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
1 #doitlive commentecho: true
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
2 #doitlive prompt: {user.blue}@{TTY.MAGENTA}mtlpyladies{TTY.RESET}:{dir.green}$
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
3
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
4 #Let's get a remote repo...
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
5 hg clone ssh://gnuoctave@octave.org/hg/evolve-talk/
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
6 cd evolve-talk
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
7
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
8 #doitlive pause:
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
9 #And let's look around...
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
10 ls
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
11 hg log
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
12 hg bookmarks
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
13 hg branches
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
14
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
15 #We can clone our repo locally too, useful for super-safe throw-away things
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
16 cd ..
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
17 hg clone evolve-talk evolve-talk-backup
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
18
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
19 #Note that each repo has a different default path
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
20 cd evolve-talk
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
21 hg path
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
22 cd ../evolve-talk-backup
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
23 hg path
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
24
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
25 #doitlive pause:
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
26 #Short little commit...
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
27 cd ../evolve-talk
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
28 sed -i 's/evolve/revolt/gi' talk.tex
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
29 hg diff
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
30 hg ci -m "Change the name of Evolve to revolt"
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
31
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
32 #doitlive pause:
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
33 #This added a new commit to our log...
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
34 hg glog
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
35
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
36 #Let's compare with the remote repo
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
37 hg outgoing
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
38 hg incoming
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
39
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
40 #And let's push our change to the remote repo!
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
41 hg push
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
42
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
43 #doitlive pause:
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
44 #Another silly little local commit...
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
45 sed -i 's/jordi/loldi/g' evolve-session
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
46 hg st
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
47 hg diff
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
48 hg ci -m "Change Jordi's name to Loldi."
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
49
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
50 #doitlive pause:
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
51 #Let's add another remote path to our local clone
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
52 cd ../evolve-talk-backup
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
53 hg config --local
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
54
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
55 #And let's compare with two different locations
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
56 hg inc
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
57 hg inc default
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
58 hg inc upstream
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
59 hg out
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
60 hg out upstream
4
aa2b23a68003 Add a few more hg log commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
61 hg log
1
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
62
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
63 #Let's pull from each
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
64 hg pull upstream
4
aa2b23a68003 Add a few more hg log commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
65 hg log
1
624bfe6018f3 Add session2.sh
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
66 hg pull default
4
aa2b23a68003 Add a few more hg log commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
67 hg log