# # # patch "contrib/mtn_cheat_sheet.svg" # from [7d45be0a47b5ba688178603c576181c5b93e9a29] # to [03ede78f40bd4b93f0aa5897cff3887c3264a682] # ============================================================ --- contrib/mtn_cheat_sheet.svg 7d45be0a47b5ba688178603c576181c5b93e9a29 +++ contrib/mtn_cheat_sheet.svg 03ede78f40bd4b93f0aa5897cff3887c3264a682 @@ -9,17 +9,61 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="841.88977pt" - height="595.27557pt" + width="1190.5511pt" + height="841.88977pt" id="svg2" sodipodi:version="0.32" inkscape:version="0.43" version="1.0" - sodipodi:docbase="/share" + sodipodi:docbase="/home/tommyd/monotone/net.venge.monotone/contrib" sodipodi:docname="mtn_cheat_sheet.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-width="1210" + inkscape:window-height="828" + inkscape:window-x="62" + inkscape:window-y="34"> + position="339.0044" + id="guide7419" /> + + + + + + + + + + + + + + + + + + + + + @@ -115,258 +323,649 @@ inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1"> + + + Manage Your Workspace + // update your workspace$ mtn update or$ mtn up// add files$ mtn add foo bar/baz// remove files$ mtn drop [--execute] foo or$ mtn rm [-e] foo// rename files and folders$ mtn rename foo bar or$ mtn mv foo bar// revert uncommitted changes $ mtn revert foo bar baz// commit your changes$ mtn commit [FILE [...]] or$ mtn ci -m "Log message" [FILE [...]] + + + + Share With Others + // push to the default server$ mtn push or$ mtn push "my.branch*"// pull from the default server$ mtn pull or$ mtn pull "my.branch*"// synchronize completly (push & pull)$ mtn sync or$ mtn sync "my.branch*"// setup a server $ mtn serve "*"// override the defaults$ mtn push some.server:5432$ mtn pull --db foo.mtn$ mtn sync --db foo.mtn some.server:5432$ mtn serve --bind 5432 "my.branch*" \ --exclude "my.branch.secret" + Manage Your Workspace - // update your workspace// setup a new, empty branch$ mtn update -or-$ mtn setup -b "my.empty.branch" [path]// checkout an existing branch// a) branch-based$ mtn up$ mtn checkout --db foo.mtn \ or --branch "my.branch" [path]// add files$ mtn co -d foo.mtn -b "my.branch" [path]$ mtn add foo bar/baz// b) revision-based// remove files$ mtn checkout --db foo.mtn \ or$ mtn drop foo -or- --revision 5a439... [path]$ mtn rm foo$ mtn co -d foo.mtn -r 5a439 [path]// rename files and folders// display heads of a branch$ mtn rename foo bar -or-$ mtn heads --branch "my.branch" or$ mtn mv foo bar$ mtn heads -b "my.branch"// revert uncommitted changes // merge multiple heads together$ mtn revert foo bar baz$ mtn merge --branch "my.branch"// commit your changes// merge multiple heads by using the $ mtn commit [FILE [...]] -or-// least common anchestor$ mtn ci -m "Log message" [FILE [...]]$ mtn merge --branch "my.branch" --lca + x="810.37573" + y="542.22139" + id="tspan8576" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000066;fill-opacity:1;font-family:Bitstream Vera Sans">// explicitly merge two revisions$ mtn explicit_merge 5ab6f 34fa5 "new.branch"// merge one branch into a subdirectory// in another branch$ mtn merge_into_dir "source.branch" \ "target.branch" "path/in/target/branch"// propagate changes from one branch// to another branch asymmetrically$ mtn propagate "my.branch" "your.branch" If applicable, many of the above commands can be triggered without the --db (-d) and --branch (-b) parameters if you are withina checked out workspace. + Repository Actions Share With Others + id="tspan2443" + x="463.75638" + y="585.08429">Command Completion // push to the default serverNo need to type out long Hash IDs - $ mtn push -or-monotone expands them automagically!$ mtn push "my.branch*"$ mtn checkout --db foo.mtn --revision 5a42// pull from the default servermtn: expanded selector '5a42' -> 'i:5a42' $ mtn pull -or-mtn: expanding selection '5a42' $ mtn pull "my.branch*"mtn: expanded to '5a42828b9edf4957a82dc...' + + Manage Security + // synchronize completly (push & pull)// TODO$ mtn sync -or-$ mtn sync "my.branch*"// setup a server $ mtn serve "*"$ mtn cert ...// override the defaults$ mtn push some.server:5432$ mtn pull --db foo.mtn$ mtn sync --db foo.mtn some.server:5432$ mtn serve --bind 5432 "my.branch*" \ --exclude "my.branch.secret" - + x="89.225746" + y="643.56018" + id="tspan11364" /> + + + Database Maintenance + // TODO + + even more TODO:- informative things (mtn ls ...)- rcs_import- packet i/o- vars- debug- automate (?)