Preview

Document Sample
Preview Powered By Docstoc
					hg for advisors                                                                                                                      Benjamin P. Wood
                                                                                                           cs.washington.edu/homes/bpw/dvcs-for-advisors

                         key                                            changesets in sync                              local changesets committed




                                                 make changes
unchanged:
                               working                                                 local repository                  local repository                        local repository
          local repository      copy
                                                                                              ...         hg commit             ...                edit                 ...
changed:
                               working
          local repository      copy
                                                                            it
parent revision:                                                       ed                  working                         working              hg commit          working
                                                                                            copy                            copy                                    copy
                                                    local repository

             hg clone paper-repos .                             ...
                                                                                                         sh
    ...                                                                                             hg pu




                                                                                                                                      hg pull
                                                                                 hg




                                                                                                                                                  hg
               inspecting state                                                     pu




                                                                                                                                                     co
                                                                                      ll
hg diff                                                    working




                                                                                                                                                       mm
diff -r 8c7475392b8a paper.tex
                                                            copy




                                                                                                                                                         it
--- a/paper.tex Wed Mar 30 09:56:28 2011 -0700
+++ b/paper.tex Thu Mar 31 11:26:39 2011 -0700                                         local repository                  local repository                        local repository
@@ -1207,5 +1207,5 @@
 Our algorithm offers                                                 hg                      ...                               ...             hg merge                ...
-modest performance                                                      up
                                                 get changes




+\emph{astounding} performance                                             da
 gains over previous work.                                                    te
hg status
M    paper.tex

hg log -G
view local repository as a graph
hg incoming / hg outgoing                                                                  working                         working                                 working
changesets to be pulled / pushed                                                            copy                            copy                                    copy

          rules to avoid confusion
1. Never update a changed working copy.
                                                                                                                                                            after fixing any conflicts:
2. After a merge, never edit (except conflict
   fixes) before committing.
                                                                                                    mercurial.selenic.com                                 hg resolve --mark paper.tex
3. Ask if you're unsure.

				
DOCUMENT INFO
Shared By:
Categories:
Tags:
Stats:
views:5
posted:8/29/2012
language:Norwegian (Nynorsk)
pages:1