Mercurial > public > dvcs_intro_brownbag

comparison slides.rst @ 6:bcc4d16e03e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Used "working directory" instead of "working copy". Other minor changes. Introduced push & pull earlier.
author Brian Neal <bgneal@gmail.com>
date Sun, 13 Nov 2011 13:55:53 -0600
parents b9801a668bff
children cb7409a6ae2d
comparison
equal deleted inserted replaced
5:b9801a668bff 6:bcc4d16e03e8
95 =========================== 95 ===========================
96 96
97 .. image:: images/dvcs.png 97 .. image:: images/dvcs.png
98 98
99 All repositories are peers. By convention only, one repository is designated the master. 99 All repositories are peers. By convention only, one repository is designated the master.
100 It is possible for all peers to exchange changes. 100 It is possible for all peers to exchange changes (via *push* and *pull* operations).
101 101
102 ---- 102 ----
103 103
104 What does a DVCS buy you? 104 What does a DVCS buy you?
105 ========================= 105 =========================
167 ---- 167 ----
168 168
169 Split Geography 169 Split Geography
170 =============== 170 ===============
171 171
172 - Imagine a team split between Cedar Rapids & Richardson 172 - Imagine a team split between Cedar Rapids & Richardson...
173 - With a CVS, you have to pick where to put the server 173 - With a CVS, you have to pick where to put the server
174 - The remote location is stuck with network latency & associated problems 174 - The remote location is stuck with network latency & associated problems
175 - With a DVCS, each site can have a central repository 175 - With a DVCS, each site can have a central repository
176 176
177 - The two central repos can be synched when convenient or even scripted 177 - The two central repos can be synched when convenient or even scripted
279 279
280 Introduction to Mercurial 280 Introduction to Mercurial
281 ========================= 281 =========================
282 282
283 - Overview 283 - Overview
284 - Repositories & working copies 284 - Repositories & working directories
285 - Changesets 285 - Changesets
286 - Branches & Tags 286 - Branches & Tags
287 - Example workflow 287 - Example workflow
288 - Command overview 288 - Command overview
289 289
304 - Integrates with Trac 304 - Integrates with Trac
305 - Can import history from other tools, including Subversion 305 - Can import history from other tools, including Subversion
306 306
307 ---- 307 ----
308 308
309 Repositories & Working Copies 309 Repositories & Working Directories
310 ============================= 310 ==================================
311 311
312 A repository consists of two things: 312 A repository consists of two things:
313 313
314 - Your working directory (similar to a working copy in SVN) 314 - Your working directory (similar to a working copy in SVN)
315 - The repository itself (also known as "the store") 315 - The repository itself (also known as "the store")
318 318
319 Example:: 319 Example::
320 320
321 $ ls -A 321 $ ls -A
322 .hg .hgignore images/ slides.cfg slides.css slides.html slides.rst 322 .hg .hgignore images/ slides.cfg slides.css slides.html slides.rst
323
324 - Repositories communicate via the *push* and *pull* commands
325
326 - Push & Pull do not affect your working directory
327
328 - An *update* or *merge* must be performed to receive remote changes into your working directory
323 329
324 ---- 330 ----
325 331
326 What's in a Repository? 332 What's in a Repository?
327 ======================= 333 =======================
393 Example Workflow (cont.) 399 Example Workflow (cont.)
394 ======================== 400 ========================
395 401
396 .. image:: images/workflow3.png 402 .. image:: images/workflow3.png
397 403
404 - Notice that after Alice's pull:
405
406 - Her working directory is unaffected
407 - Her repository only has one head => no merging required
408
409
398 ---- 410 ----
399 411
400 SVN Commands for Review 412 SVN Commands for Review
401 ======================= 413 =======================
402 414