hgbook

annotate es/examples/tour @ 846:29b47af6a275

find changesets by author, revision, files, or words in the commit message
Adding KDiff3 screenshot.
author gpiancastelli
date Sat Aug 22 17:02:37 2009 +0200 (2009-08-22)
parents
children
rev   line source
igor@333 1 #!/bin/bash
igor@333 2
igor@333 3 #$ name: version
igor@333 4
igor@333 5 hg version
igor@333 6
igor@333 7 #$ name: help
igor@333 8
igor@333 9 hg help init
igor@333 10
igor@333 11 #$ name: clone
igor@333 12
igor@333 13 hg clone http://hg.serpentine.com/tutorial/hello
igor@333 14
igor@333 15 #$ name: ls
igor@333 16 #$ ignore: ^drwx.*
igor@333 17 #$ ignore: ^total \d+
igor@333 18
igor@333 19 ls -l
igor@333 20 ls hello
igor@333 21
igor@333 22 #$ name: ls-a
igor@333 23
igor@333 24 cd hello
igor@333 25 ls -a
igor@333 26
igor@333 27 #$ name: log
igor@333 28
igor@333 29 hg log
igor@333 30
igor@333 31 #$ name: log-r
igor@333 32
igor@333 33 hg log -r 3
igor@333 34 hg log -r 0272e0d5a517
igor@333 35 hg log -r 1 -r 4
igor@333 36
igor@333 37 #$ name: log.range
igor@333 38
igor@333 39 hg log -r 2:4
igor@333 40
igor@333 41 #$ name: log-v
igor@333 42
igor@333 43 hg log -v -r 3
igor@333 44
igor@333 45 #$ name: log-vp
igor@333 46
igor@333 47 hg log -v -p -r 2
igor@333 48
igor@333 49 #$ name: reclone
igor@333 50
igor@333 51 cd ..
igor@333 52 hg clone hello my-hello
igor@333 53 cd my-hello
igor@333 54
igor@333 55 #$ name: sed
igor@333 56
igor@333 57 sed -i '/printf/a\\tprintf("hello again!\\n");' hello.c
igor@333 58
igor@333 59 #$ name: status
igor@333 60
igor@333 61 ls
igor@333 62 hg status
igor@333 63
igor@333 64 #$ name: diff
igor@333 65
igor@333 66 hg diff
igor@333 67
igor@333 68 #$ name:
igor@333 69
igor@333 70 export HGEDITOR='echo Added an extra line of output >'
igor@333 71
igor@333 72 #$ name: commit
igor@333 73
igor@333 74 hg commit
igor@333 75
igor@333 76 #$ name: merge.dummy1
igor@333 77
igor@333 78 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-hello
igor@333 79
igor@333 80 #$ name: tip
igor@333 81
igor@333 82 hg tip -vp
igor@333 83
igor@333 84 #$ name: clone-pull
igor@333 85
igor@333 86 cd ..
igor@333 87 hg clone hello hello-pull
igor@333 88
igor@333 89 #$ name: incoming
igor@333 90
igor@333 91 cd hello-pull
igor@333 92 hg incoming ../my-hello
igor@333 93
igor@333 94 #$ name: pull
igor@333 95
igor@333 96 hg tip
igor@333 97 hg pull ../my-hello
igor@333 98 hg tip
igor@333 99
igor@333 100 #$ name: update
igor@333 101
igor@333 102 grep printf hello.c
igor@333 103 hg update tip
igor@333 104 grep printf hello.c
igor@333 105
igor@333 106 #$ name: parents
igor@333 107
igor@333 108 hg parents
igor@333 109
igor@333 110 #$ name: older
igor@333 111
igor@333 112 hg update 2
igor@333 113 hg parents
igor@333 114 hg update
igor@333 115
igor@333 116 #$ name: clone-push
igor@333 117
igor@333 118 cd ..
igor@333 119 hg clone hello hello-push
igor@333 120
igor@333 121 #$ name: outgoing
igor@333 122
igor@333 123 cd my-hello
igor@333 124 hg outgoing ../hello-push
igor@333 125
igor@333 126 #$ name: push
igor@333 127
igor@333 128 hg push ../hello-push
igor@333 129
igor@333 130 #$ name: push.nothing
igor@333 131
igor@333 132 hg push ../hello-push
igor@333 133
igor@333 134 #$ name: outgoing.net
igor@333 135
igor@333 136 hg outgoing http://hg.serpentine.com/tutorial/hello
igor@333 137
igor@333 138 #$ name: push.net
igor@333 139
igor@333 140 hg push http://hg.serpentine.com/tutorial/hello
igor@333 141
igor@333 142 #$ name: merge.clone
igor@333 143
igor@333 144 cd ..
igor@333 145 hg clone hello my-new-hello
igor@333 146 cd my-new-hello
igor@333 147 sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c
igor@333 148 hg commit -m 'A new hello for a new day.'
igor@333 149
igor@333 150 #$ name: merge.dummy2
igor@333 151
igor@333 152 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello
igor@333 153
igor@333 154 #$ name: merge.cat
igor@333 155
igor@333 156 cat hello.c
igor@333 157 cat ../my-hello/hello.c
igor@333 158
igor@333 159 #$ name: merge.pull
igor@333 160
igor@333 161 hg pull ../my-hello
igor@333 162
igor@333 163 #$ name: merge.dummy3
igor@333 164
igor@333 165 hg log -r 6 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV6.my-new-hello
igor@333 166
igor@333 167 #$ name: merge.heads
igor@333 168
igor@333 169 hg heads
igor@333 170
igor@333 171 #$ name: merge.update
igor@333 172
igor@333 173 hg update
igor@333 174
igor@333 175 #$ name: merge.merge
igor@333 176
igor@333 177 hg merge
igor@333 178
igor@333 179 #$ name: merge.parents
igor@333 180
igor@333 181 hg parents
igor@333 182 cat hello.c
igor@333 183
igor@333 184 #$ name: merge.commit
igor@333 185
igor@333 186 hg commit -m 'Merged changes'
igor@333 187
igor@333 188 #$ name: merge.dummy4
igor@333 189
igor@333 190 hg log -r 7 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV7.my-new-hello
igor@333 191
igor@333 192 #$ name: merge.tip
igor@333 193
igor@333 194 hg tip