Mercurial > public > dvcs_intro_brownbag

comparison slides.rst @ 3:0130da731f83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More work on the presentation.
author Brian Neal <bgneal@gmail.com>
date Thu, 10 Nov 2011 22:04:38 -0600
parents 802024c24c4e
children c9a18db51976
comparison
equal deleted inserted replaced
2:802024c24c4e 3:0130da731f83
252 - Sometimes this can be a problem... 252 - Sometimes this can be a problem...
253 253
254 - With a DVCS: 254 - With a DVCS:
255 255
256 - You make changes in your working copy 256 - You make changes in your working copy
257 - You commit! 257 - You commit locally!
258 - You can then choose to pull changes from others and merge 258 - You can then choose to pull changes from others and merge
259 259
260 - **Your changes are already safely tucked away and can be retrieved later if things go wrong** 260 - **Your changes are already safely tucked away and can be retrieved later if things go wrong**
261 261
262 ---- 262 ----
282 ---- 282 ----
283 283
284 Introduction to Mercurial 284 Introduction to Mercurial
285 ========================= 285 =========================
286 286
287 - Command overview
288 - Repositories & working copies 287 - Repositories & working copies
289 - Changesets 288 - Changesets
290 - Revisions, changesets, & heads 289 - Revisions, changesets, & heads
290 - Command overview
291 - Example workflow 291 - Example workflow
292 292
293 ---- 293 ----
294 294
295 What is a CVCS Again? 295 Repositories & Working Copies
296 ===================== 296 =============================
297
298 A repository consists of two things:
299
300 - Your working copy (a directory tree of files)
301 - The repository itself (also known as "the store")
302
303 - A .hg directory at the top of your working copy
304
305 Example::
306
307 brian@gremmie:~/Documents/Rockwell/brownbags/dvcs/dvcs$ la
308 .hg .hgignore images/ slides.cfg slides.css slides.html slides.rst
309
310 ----
311
312 What's in a Repository?
313 =======================
314
315 A repository consists of a directed, acyclic graph of *changesets*
316
317 .. image:: images/repos.png
318
319 - Each changeset can have 0, 1, or 2 parents
320 - A changeset with 0 parents is the root
321 - A changeset with 2 parents is the result of a merge
322 - The newest changeset is called the *tip*
323
324 ----
325
326 SVN Commands for Review
327 =======================
297 328
298 Basic SVN commands: 329 Basic SVN commands:
299 330
300 - add, remove, copy, move, mkdir 331 - add, remove, copy, move, mkdir
301 - checkout, commit, update, revert 332 - checkout, commit, update, revert
303 - status 334 - status
304 - lock, unlock 335 - lock, unlock
305 336
306 ---- 337 ----
307 338
308 So what's a DVCS look like? 339 Mercurial Commands
309 =========================== 340 ==================
310 341
311 Mercurial (hg) vs SVN commands: 342 Mercurial (hg) vs SVN commands:
312 343
313 - add, remove, copy, move, :strike:`mkdir` 344 - add, remove, copy, move, :strike:`mkdir`
314 - :strike:`checkout`, commit, update, revert 345 - :strike:`checkout`, commit, update, revert