Mercurial > hg-talk
changeset 3:4f46f63130a6
Add more pauses to session1.sh
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Thu, 06 Nov 2014 16:48:21 -0500 |
parents | dd7a3a06dfe7 |
children | aa2b23a68003 |
files | session1.sh |
diffstat | 1 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/session1.sh Thu Nov 06 16:48:08 2014 -0500 +++ b/session1.sh Thu Nov 06 16:48:21 2014 -0500 @@ -22,23 +22,23 @@ ls cat mars.txt -# +#doitlive pause: #Several ways to get information about our current state hg summary hg status hg diff -# +#doitlive pause: #Add the file hg add mars.txt -# +#doitlive pause: #Let's see how the information changed! hg summary hg status hg diff -# +#doitlive pause: #And we commit the file hg commit -m "Starting to think about Mars" @@ -46,12 +46,13 @@ hg status hg diff -# +#doitlive pause: #Most excitingly, we have a log! hg log echo "The two moons may be a problem for Wolfman" >> mars.txt +#doitlive pause: #Adding more changes will show up differently hg summary hg status @@ -60,6 +61,7 @@ hg commit -m "Concerns about Mars's moons on my furry friend" hg log +#doitlive pause: #Another change, this time adding another file... echo "But the Mummy will appreciate the lack of humidity" >> mars.txt echo "That big red spot is quite the storm." >> jupiter.txt @@ -68,6 +70,7 @@ hg diff hg commit -m "Thoughts about the climate" +#doitlive pause: #Now that we have some history to speak of, let's explore it. hg log --patch --verbose --graph hg log -pvG @@ -84,21 +87,26 @@ hg ann --user --date --number --changeset mars.txt hg ann -udnc --quiet mars.txt +#doitlive pause: #Let's make some mistakes... echo "We will need to manufacture our own oxygen" >> mars.txt hg diff +#doitlive pause: #Nah, never mind, we don't want to record this change, let's just throw it out hg revert mars.txt hg diff +#doitlive pause: #Y'know what, let's actually restore this file to an older version hg rev -r 0 mars.txt hg diff +#doitlive pause: #Hm, but why does that look changed? hg rev mars.txt +#doitlive pause: #Let's *move* around the history instead of just changing individual files hg update --rev 0 cat mars.txt