# HG changeset patch # User Jordi GutiƩrrez Hermoso # Date 1415310455 18000 # Node ID 624bfe6018f376bd37e8bfa63e5d26b37b9838f5 # Parent 882028e37e4a559a0efbd62d9f808e15886dd347 Add session2.sh diff -r 882028e37e4a -r 624bfe6018f3 session2.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/session2.sh Thu Nov 06 16:47:35 2014 -0500 @@ -0,0 +1,64 @@ +#doitlive commentecho: true +#doitlive prompt: {user.blue}@{TTY.MAGENTA}mtlpyladies{TTY.RESET}:{dir.green}$ + +#Let's get a remote repo... +hg clone ssh://gnuoctave@octave.org/hg/evolve-talk/ +cd evolve-talk + +#doitlive pause: +#And let's look around... +ls +hg log +hg bookmarks +hg branches + +#We can clone our repo locally too, useful for super-safe throw-away things +cd .. +hg clone evolve-talk evolve-talk-backup + +#Note that each repo has a different default path +cd evolve-talk +hg path +cd ../evolve-talk-backup +hg path + +#doitlive pause: +#Short little commit... +cd ../evolve-talk +sed -i 's/evolve/revolt/gi' talk.tex +hg diff +hg ci -m "Change the name of Evolve to revolt" + +#doitlive pause: +#This added a new commit to our log... +hg glog + +#Let's compare with the remote repo +hg outgoing +hg incoming + +#And let's push our change to the remote repo! +hg push + +#doitlive pause: +#Another silly little local commit... +sed -i 's/jordi/loldi/g' evolve-session +hg st +hg diff +hg ci -m "Change Jordi's name to Loldi." + +#doitlive pause: +#Let's add another remote path to our local clone +cd ../evolve-talk-backup +hg config --local + +#And let's compare with two different locations +hg inc +hg inc default +hg inc upstream +hg out +hg out upstream + +#Let's pull from each +hg pull upstream +hg pull default