? PQ3ު-$@e*ɫ(=Xgx '-Ǭ4+*-V:48;Ӯ0(@/i,:Ư-'/+WG2_4)DZ.$ /Eu#-ɲ.9&>`)ɳ+!7Q3e,ƴ.%$7#\Fǵ*۵%9>x )_IZSM3X07L:DI?5κ@JErG,KJx*üL.;6j;Yݽc7:2־: )D&n?EտC1_F6/?D\noDO#XsL6ZPTDE@n&&xh|lRh:C,p^="be!.!@/b][(Lu "(' g^R($;K9W b~a p})@j{IX?F#<|kxM2~lCr}#hdfm4^a<;6rssn yzcbqRazVvqHP   Y+ 3 ) q ,U  R f S`#'PH_0XVjWCP7W8E9~O/8[=47'$9L@J!>4>sCCE:=;5B04s? ,! 9N  L E 7/!Cg!H!T!\I"K"d"7W#-#6##p$?%X%e&'z ((+m))#z*i+,4-E--sT..`//0e193>3:354R56.6e7eI88C9<::L;|;c<[R=y=^(>?'@;ABBDC}CRD.EE`FFXHYH}HWIN9JALLkOMN3NVO#[O\P PoQhYRRASI TBjT8T_T]FVnVWxWXXsY+ZZ[\j]1^9A^{^u^M`*_`!````amb"c29clccccxcWdXtd"ddeme?fdRffgJihieNjDj?j/9k5ik k k*k*k l l l/lCl Rl^lgl zll6l1l m5m*SmM~m-m0m,+n Xo0yo*oooUoU@pp"p*p*pq1q9qAq IqTq\qdqlqtq|qq qq q qq q q!qIr,_rr rr!rr!s"#s Fs Rs^s ts s s s sssssss0s(t+t1Gt0yttttt-u*>uiu"}u)u$u+u&v%Bv-hv(v+vvwFw'[ww&w+w%w x&7x^xwx xx:xx yy.y1?yqy#yyyyy z*)zTz'hzz"zzz+z+ {L{j{o{{|'|<| V|a| w||$||+|I },T}}}} }&}}> ~(K~+t~~5~~3(B7k)"0$Bg}0ނk.>4م$#3+W)8%I(rvc)9.#hP+݊ "<077oMЍlp8yƏ؏  @ B"Ceb$:A+Q}$  •0Ε  * 3.A p} O /,C9p Θ ՙg Lb-r4՝'PiG6J~@ɟ  (49=4/4<A3H%|8¤; ?+K*w&ɦ ۦ ;KXK5&;Yr !=@ZةQ3A\x[s9Ur)Cm?Cvf{zW](޳Sݴ*q/)QnuκD˻k& -7n<Ž˽!Խv$4&q! # 18>2w; &<0m 3 9: ISel }62(Mv =PY `l-)*% 3G)[B9C*%n&0F"i7.43L;5(36O'*((*+V ] g r~.3#"F#b1+6*?2j /.Jy" ,"I*l%# +8d  1#K2o-  #,G`gkz>.(Bk%4")L]n <<2 COc!z'p]f~5!%$=\3n" &# 1/C s?$6O$j' +&'+!S'u&-/-!] /$#5LBk9$ ($#Mq'! $ @:a.-+'%.M&|$*%#*=h(0 %$:_'y ##5 Vgp#)-C_u ),+Kg "08,1<^&35 ;GbD#6?+v #  :8K).&6U  0*A+R~!  !/Om!$-#7%['&#6Zz #+'/D'c")B">)Q{>/"4;p  &)#);e  * K+f/ :)Q{&%&=d.!0@Vh7<U(C8Tg&m D +-HW)r  ,3CHXn !*  >-L*z853,`.# #>/W> 0 !& H0V&=  *JZw1-"(K `/8+R(~' !,!N(p: $'/F f )*!4Vv! &' DRq!?O9h "5X o!#'-Gew!$(;Y"k-"' >: y  %      $ % A [  o y 7   (  1 9J & 1   , -C q   +   /,ErHT#D"h#*36!Eg5  '?<Q0 4U4j!A#6G^Mw)';Qdz+ >:&y+/)?R cp& [)&CP<#=-36a9<!A4R " 0*=[/% F Uc6O"(2-[<(#53i4)I +SW -3at"* *E %p  ! $  #!$7! \!}!$! ! !! "?"*Q"!|"0"""-# <#]#y#-#(##$$$#=$)a$-$!$!$5$&3%Z%b%&|%%%%)%%&/9& i&"& &&(&(& '='W'&f''4'''(( ;(\(d(~(&(((( )A)!a)#)'))))*&4*$[*(*&***M+ U+_+s+!+!++%+, ,,,2>, q,.~,-,,, --5-G-_-)s-- ----./.H.`.%x.8.4.8 /!E/g//'/%//%/"080=Q0000#0*0 #1 D1R11h111)1*12'292K2_2v222$2 2223!3 73$E3*j3!333*3, 4*M4x4)4#44445 5%A5 g5'q5 5555) 636 M6n66666$656!7>7\7#z7"77757.8)@8$j888 8+808,9-E91s99299:. :#O:2s:(::#:;#';K;k;+;?;%;<13<e<<<<<<=% =%F=&l= =7=3=! >,>H> a>k>5>>$>> ?(?$D?%i?$???$?@. @O@f@n@!@!@%@&@A>:A+yAA"AA A B,BE)pEEEE/EF4FRFcFsFF)F$F@F?5GuGG5GGGH-*HXHxHTHI0J8J(QJzJJJJ:J $KEKWKjKK!K'K5KRLrLL6L,L[M^M,mMM M'MM N!N;N)ONyNNNNNNNOO5ODOEYOOOO O PP/-P@]P$P0PPQ.Q07Q hQQQ3Q6Q. R#OR3sRRRRRRS*SDSSSfS}S=S+S5T@9T+zTBT'T8UJUjU#U2UUU:V&RVyVV$VV&V"W#?WcW)~WW WWW WW0X@BX&X4XpX5PYY8Y?Y1Z&PZ(wZ;ZZ!Z6[Q[2f[2[R[G\'g\(\+\3\&]?]G]']1^D^^W^_3e```$``aa9a*Pa{aaaaaaa b7&b<^b@b+b-c:6c4qccc8Ld;d0d(d/e,Ke:xe-e'e+ f5fg2g4Lg)g.g$g/g/h#Ehih-h.h9h>i)Yii+i!ii j3j,Sjj.j%j$j#kF:kk*kkk9k2l llb mmmjBnOn8n_6o6oNo:pCWp>p3pAqQPqoq?r3RrNr)rBr)Bs7lsCskskTtEt*u=1u+ou,u9uNvQQv5vLv8&w2_wwH;xcxLx=5yIsyZyNzEgzhzf{>}{{|g~~UkXoj~j]Tl?܆]$Puڊ-[.-;s"t( 4 Rs". h&5l\ɗ;@UJbvٜdJ D/P-Hv~vL<<.k:#(L6;zrpN^k<tqukɰN5__D<c=E9yGy;*ַøĹ`Nneo~տ|TvFHQd3(Ox+0L-LX&V,MR(h9EX0Ar,:JI4r,v470<AI~o,8CeBWWDOJ>7KvNFJX',,+%QFhF>H5M~Y\&GG7,K;xud9i0 O*[\Ui 6(_y0 EL@9qz^K6{9v,GltH+Dgz An!Wzv{maJ:qD /[ \  Q 7 l= m FEZ@CR%gxqR4F 9>~^Q"/!Rt66Uux@ W] "  r!m!?!d<""#c%h%eN&G&?&/<'4l'' '0'4' ( '(2( B(P( c(n(( ((<(2(()-;)-i)E)0)0*,?*$l+;+,++ ,U,Ud,,,%,#-(-D-L-T- \-g-o-w----- - -"--- - .%.Q:.... ..!/"/!9/([/ / // / // / //00#0,0 50.?0n0q070=01!141S1+h1)11!1$1&2&@2!g2 2(2#2&23>3LP3(33)3- 4':4&b4&4!44 4435L5c5v55655&56%6 D6e6!u6266&67777P7*n7*7777t8878!8 8%8 9#*98N9"9"9@9,: ;: \:}: :%::@:/;,@;m;F;&;J;/F<6v<3<<<) =04=!e==t=>0??@u,B?B8B'C#CC,gC C*CFCD3DKDONDDDE;F5@FJvFSGFH \HfH kHHP=I8JJRJ+KLL LAMHM\MsM","'O-wA8 91S1; ! >_x!1͎+Ecy#!ُ-)(?'h -Ր"+Bn7ڑ%-.M-| ÒҒ'.5<Nj9<+.Zs02$*Oav ;:#: KUi#ȖkX_v7˗)(.9h9|-'. &;b=|-1'#B&f%(њ0$+1P40((1:-l#8ݜ'$>#c=*ŝ, 8IYI+/3)c̟'*?['w2.Ҡ--/(]80*:+V). ۢ%2"Ul(٣* 1/<.l)5Ť "8#[*(ե9Xw-- /P i*s1>//2_3.ƨ1  =Kh%̩Q:6X+ Ȫ% /?X?i)ګ %A,S< ʬ ٬1 ?_w)̭*G _mŮ%ޮ":'b1 կ-$<ay) ΰܰ%1 +;3g*!ݱB!Z|'Gٲ-!$Ot3,߳ %$'Jr+3 );Nm2.5*Q|+ƶ- 9Pg Է//)I"s)!޸*CWqܹ *@G4Jۺ:&au2|L 2.Q 4  ,:/M}ν", 06g$ -* <#5`2ɿ72#Pt.=  H.V ! 0%;V gt25P,b$'*@"X1{'*())G q{%"(;/k-z0--L)z !7Y!w,+ "8[s4R(r$ %@f#%0 3Tc/* '5N]/},&?7w&0Pd"m:16O?i(3&=>0|*)8Sq.!Tc?% "- 6;5r%=Y#n#B%"?b<| * ;<"x[#.E"cb0/Ib|/ ?Y#sE71G%f38Slc5G@N)F5A6x==# -1<n#*BD*1#?Td.zQ$1)5[@&%"6B$yC70SC-Y <He7|$,$K(p;>+!@"b!/-;Ll G2$87] !/%.G,a-"%)62`",&(/.Hw5"0!F'h21(( Qr&5)%@f,%- EFP(+. ;#Y2}.0,"=`Zt "&;[(y > 56U 2%X)n.*&B/i6:# /M/k+30BL+2 $=bt?//&Vn) 8#Cg 4%0(V+,-+ 'Lt|<'(!7Yr2!3NV_&q9(.'WB(+I\ l%x0/&?&f0{9!,@(m(% ;2T7(2;![}%.#@,d :4' !4V r4*  9 )W ) -   # + .D s   ' ' ! %1 W Cv 6  $  1  R  _ 1k  * % e o    ; 4)6^#&10)!Z'| ! -'9U('/,Jj |/*?;W8 !<2^( !l.*":]9x ('(PDym,J4c.G,_!%GbuD#h) />5't5 5"Hk18: )G:q '+;Ri}G3 @E K / H!-K!>y!0!!0"88"*q")"W"3#(R#{#5#!#*#2$-L$&z$4$!$$ %%,%-<%8j%;%%8%6&9&"&@'GV'?')'.(77(o(!(2((?(;<)Ux)[)#**-N*/|*:**+ +1+@+:,e[d5}T0A"2s0h7;#D (u/m?G';~(XDyvSU*+3 W%=sxM.4/#;LkclSBWXQ| ~u| kXYS4J)-e"F*`E19v8g5}Mt3:pP"V+"4L-<^Zz.PYJxYl7g rB65J! (:R28tVy   Fb|#O5>"M6I@2P Tj[C}(>I`OEgfzEGf4']3R=W,1qb^nKC.&w93"!kc>rd[JT)e2fH)\|H9KUadj7U}|h"75<{y`;HNFC$f nOx @$ @4rwAvskU"Sew%#C~,[lBRyo<1]vpjM4l.Qz]Mq 2 ='On mIigCu#{RMPT~B.QKb!j^k@*8frS!NDRAO/o c-WOK>e0w?'f6 _T_4 wo|odXY1bLUfm$ 0rS%%G 8D$&yLVE#00+uIlp,ob+=phav.AoZ[] >/:yt& @:)dI33k+Z,*!L8:% AUg+8 0 :%y9_lnzi]BY19_Y!^Bb?PZR-C6\xd7wi<?%>j\a*l&P_iR]m`hqJZI6K`wAIc'?^|*3x\}7 La 2I[Kvi-F__hdo NRJ?rhKX Wgga/1[}$F0tZc!1 G,^(NV9 S&z\4@dn^vs /'X@?s6oQ{pi p2VuDC7z+W NFj(;ar'm(pM_{kj=@,N/cisEn5 $U# Px>.~;xsZQt\qV7FkBEbqT-L VDa</]K W 6B&UL9j)~:P3)X{[  a=?<;$F8:* )]{1G<YNT(5 \&mqOt`Y;zAGlN-\sC.e}E HqfuwhJD~c&2HtGmHzXi`,eGZu'6nre|x-c =+WHt^yJQ$ngpQvM=~>EQ}O{S5b*AT9H{8m`Dhq )u%,!V<# To remove '-' lines, make them ' ' lines (context). To remove '+' lines, delete them. Lines starting with # will be removed from the patch. [+] marked option can be specified multiple times ``annotate`` ------------ ``auth`` -------- ``decode/encode`` ----------------- ``defaults`` ------------ ``diff`` -------- ``extensions`` -------------- ``format`` ---------- ``hostfingerprints`` -------------------- ``http_proxy`` -------------- ``patch`` --------- ``paths`` --------- ``subpaths`` ------------ ``ui`` ------ ``web`` ------- additional help topics: aliases: %s use "hg -v help %s" to show more info use "hg help %s" to show the full help text use "hg help -c %s" to see help for the %s command hg archive -r 1.0 project-1.0.zip hg archive project.tar.gz -X ".hg*" hg bisect --bad 34 hg bisect --good 12 hg bisect --good hg bisect --bad hg bisect --reset hg bisect --reset hg bisect --bad 34 hg bisect --good 12 hg bisect --command 'make && make tests' hg bisect --skip hg bisect --skip 23 hg clone --uncompressed http://server/repo -u 1.5 hg clone -r 04e544 experimental/ good/ hg clone http://selenic.com/hg hg clone http://selenic.com/hg#stable hg clone project/ project-feature/ hg clone ssh://user@server//home/projects/alpha/ hg diff "set:added() and grep(GNU)" hg diff --git -r 1.0:1.2 lib/ hg diff --stat -r "date('may 2')" hg diff -c 9353 # compare against first parent hg diff -r 9353^:9353 # same using revset syntax hg diff -r 9353^2:9353 # compare against the second parent hg diff foo.c hg export --git -r 123:150 > changes.txt hg export -r "outgoing()" -o "%n-%m.patch" hg export -r 9353 | hg import - hg forget "set:added() and binary()" hg forget "set:hgignore()" hg graft -D "2085::2093 and not 2091" hg graft -c hg id --id > build-id.dat hg id -n -r 1.3 hg id -r tip http://selenic.com/hg/ hg import --exact proposed-fix.patch hg import -s 80 http://example.com/bugfix.patch hg import http://www.selenic.com/hg/rev/5ca8c111e9aa hg import incoming-patches.mbox hg log --debug -r tip hg log --graph -r "bisect(range)" hg log --removed file.c hg log -Mp lib/ hg log -f hg log -k alice -d "may 2008 to jul 2008" hg log -k bug --template "{rev}\n" hg log -l 10 -b . hg log -r "a21ccf and ancestor(1.9)" hg log -r "bisect(current)" hg log -r "bisect(pruned)" hg log -r "bisect(range)" hg log -r "last(tagged())::" --template "{desc|firstline}\n" hg log -v hg status --copies --change 9353 hg status --rev 9353 hg status -an0 hg update stable hg graft --edit 9393 $ ls foo.c $ hg status ? foo.c $ hg add adding foo.c $ hg status A foo.c $ cp -al REPO REPOCLONE public < draft < secret An example showing how new (unknown) files are added automatically by :hg:`add`:: To check out earlier revisions, you should use :hg:`update REV`. To cancel an uncommitted merge (and lose your changes), use :hg:`update --clean .`. - advance the current bisection by marking current revision as good or bad:: - all changesets that touch a directory, with diffs, excluding merges:: - all revision numbers that match a keyword:: - attempt to exactly restore an exported changeset (not always possible):: - changesets ancestral to the working directory:: - changesets showing all modifications of a file, including removals:: - changesets with full descriptions and file lists:: - check if a given changeset is included is a tagged release:: - check the most recent revision of a remote repository:: - clone (and track) a particular named branch:: - clone a remote repository to a new directory named hg/:: - clone from an absolute path on an ssh server (note double-slash):: - commit - import - pull - push (with this repository as the destination) - unbundle - compare a file in the current working directory to its parent:: - compare a revision and its parents:: - compare two historical versions of a directory, with rename info:: - create a lightweight local clone:: - create a repository without changesets after a particular revision:: - create a tarball excluding .hg files:: - create a zip file containing the 1.0 release:: - diff all newly-added files that contain a keyword:: - do a high-speed clone over a LAN while checking out a specified version:: - export all the changesets between two revisions to a file with rename information:: - find all changesets by some user in a date range:: - find the revision corresponding to a tag:: - forget files that would be excluded by .hgignore:: - forget newly-added binary files:: - forget the current bisection:: - generate a build identifier for the working directory:: - get a NUL separated list of added files, suitable for xargs:: - get change stats relative to the last change on some date:: - import a changeset from an hgweb server:: - import a traditional patch from a website and detect renames:: - import all the patches in an Unix-style mbox:: - last 10 commits on the current branch:: - mark the current revision, or a known revision, to be skipped (eg. if that revision is not usable because of another issue):: - see all changesets that took part in the current bisection:: - see all changesets whose states are already known in the current bisection:: - see the changeset currently being bisected (especially useful if running with -U/--noupdate):: - show all changes including copies in an existing changeset:: - show changes in the working directory relative to a changeset:: - split outgoing changes into a series of patches with descriptive names:: - start a bisection with known bad revision 12, and good revision 34:: - summary of all changesets after the last tag:: - use 'make && make tests' to automatically find the first broken revision:: - use export and import to transplant a bugfix to the current branch:: - with the graphlog extension, you can even get a nice graph:: -A/--after can be used to remove only files that have already been deleted, -f/--force can be used to force deletion, and -Af can be used to remove files from the next revision without deleting them from the working directory. 1. If neither -c/--check nor -C/--clean is specified, and if the requested changeset is an ancestor or descendant of the working directory's parent, the uncommitted changes are merged into the requested changeset and the merged result is left uncommitted. If the requested changeset is not an ancestor or descendant (that is, it is on another branch), the update is aborted and the uncommitted changes are preserved. 2. With the -c/--check option, the update is aborted and the uncommitted changes are preserved. 3. With the -C/--clean option, uncommitted changes are discarded and the working directory is updated to the requested changeset. ======= == == == == A C M ! ======= == == == == none W RD W R -f R RD RD R -A W W W R -Af R R R R ======= == == == == ? - display help Before version 1.7, the behavior without --merge was equivalent to specifying --merge followed by :hg:`update --clean .` to cancel the merge and leave the child of REV as a head to be merged separately. By default, the pending changeset will have one parent, maintaining a linear history. With --merge, the pending changeset will instead have two parents: the old parent of the working directory and a new child of REV that simply undoes REV. Examples: For efficiency, hardlinks are used for cloning whenever the source and destination are on the same filesystem (note this applies only to the repository data, not to the working directory). Some filesystems, such as AFS, implement hardlinking incorrectly, but do not report errors. In these cases, use the --pull option to avoid hardlinking. For example, the following commands are transactional, and their effects can be rolled back: In some cases, you can clone repositories and the working directory using full hardlinks with :: M = modified A = added R = removed C = clean ! = missing (deleted by non-hg command, but still tracked) ? = not tracked I = ignored = origin of the previous file listed as A (added) Mercurial will update the working directory to the first applicable revision from this list: Note that remove never deletes files in Added [A] state from the working directory, not even if option --force is specified. See :hg:`help revsets` for more about the `bisect()` keyword. Some examples: The following rules apply when the working directory contains uncommitted changes: The following table details the behavior of remove for different file states (columns) and option combinations (rows). The file states are Added [A], Clean [C], Modified [M] and Missing [!] (as reported by :hg:`status`). The actions are Warn, Remove (from branch) and Delete (from disk): This is the fastest way to clone, but it is not always safe. The operation is not atomic (making sure REPO is not modified during the operation is up to you) and you have to make sure your editor breaks hardlinks (Emacs and most Linux Kernel tools do so). Also, this is not compatible with certain extensions that place their metadata under the .hg directory, such as mq. To avoid permanent data loss, rollback will refuse to rollback a commit transaction if it isn't checked out. Use --force to override this protection. a) null if -U or the source repository has no changesets b) if -u . and the source repository is local, the first parent of the source repository's working directory c) the changeset specified with -u (if a branch name, this means the latest head of that branch) d) the changeset specified with -r e) the tipmost head specified with -b f) the tipmost head specified with the url#branch source syntax g) the tipmost head of the default branch h) tip d - done, skip remaining changes and files a - record all changes to all remaining files q - quit, recording no changes exclude path/to/file-or-dir hg qguard other.patch -- +2.6.17 -stable include path/to/file-or-dir rename path/to/source path/to/destination s - skip remaining changes to this file f - record remaining changes to this file y - record this change n - skip this change e - edit this change manually hg log --template "{rev} {phase}\n" hg log -r "not public()" hg phase --draft "secret()" hg phase --force --draft . hg phase -fd 'outgoing(URL)' %s (deprecated, use configuration file) -e/--edit, -m/--message or -l/--logfile set the patch header as well as the commit message. If none is specified, the header is empty and the commit message is '[mq]: PATCH'. -u/--user and -d/--date can be used to set the (given) user and date, respectively. -U/--currentuser and -D/--currentdate set user to current user and date to current date. .. container:: verbose .. note:: .. note:: Branch names are permanent and global. Use :hg:`bookmark` to create a light-weight bookmark instead. See :hg:`help glossary` for more information about named branches and bookmarks. .. note:: diff may generate unexpected results for merges, as it will default to comparing against the working directory's first parent changeset if no revisions are specified. .. note:: export may generate unexpected diff output for merge changesets, as it will compare the merge changeset against its first parent only. .. note:: for performance reasons, log FILE may omit duplicate changes made on branches and will not show deletions. To see all changes including duplicates and deletions, use the --removed switch. .. note:: log -p/--patch may generate unexpected diff output for merge changesets, as it will only compare the merge changeset against its first parent. Also, only files different from BOTH parents will appear in files:. .. note:: status may appear to disagree with diff if permissions have changed or a merge has occurred. The standard diff format does not report permission changes and diff only reports changes relative to one merge parent. .. note:: backout cannot be used to fix either an unwanted or incorrect merge. :``%%``: literal "%" character :``%H``: changeset hash (40 hexadecimal digits) :``%N``: number of patches being generated :``%R``: changeset revision number :``%b``: basename of the exporting repository :``%h``: short-form changeset hash (12 hexadecimal digits) :``%m``: first line of the commit message (only alphanumeric characters) :``%n``: zero-padded sequence number, starting at 1 :``%r``: zero-padded changeset revision number :``%s``: basename of file being printed :``%d``: dirname of file being printed, or '.' if in repository root :``%p``: root-relative path name of file being printed :``files``: a directory full of files (default) :``tar``: tar archive, uncompressed :``tbz2``: tar archive, compressed using bzip2 :``tgz``: tar archive, compressed using gzip :``uzip``: zip archive, uncompressed :``zip``: zip archive, compressed using deflate :hg:`resolve` must be used to resolve unresolved files. Add all new files and remove all missing files from the repository. Alternatively you can specify -c/--change with a revision to see the changes in that changeset relative to its first parent. Apply one or more compressed changegroup files generated by the bundle command. Applying bundles preserves all changeset contents including permissions, copy/rename information, and revision history. As a shortcut, you can also use the revision argument to mark a revision as good or bad without checking it out first. Bookmarks are pointers to certain commits that move when committing. Bookmarks are local. They can be renamed, copied and deleted. It is possible to use :hg:`merge NAME` to merge from a given bookmark, and :hg:`update NAME` to update to a given bookmark. Bookmarks can be pushed and pulled between repositories (see :hg:`help push` and :hg:`help pull`). This requires both the local and remote repositories to support bookmarks. For versions prior to 1.8, this means the bookmarks extension must be enabled. By default this command prints revision number and changeset id, tags, non-trivial parents, user, date and time, and a summary for each commit. When the -v/--verbose switch is used, the list of changed files and full commit message are shown. By default, diffs are sent in the format generated by :hg:`export`, one per message. The series starts with a "[PATCH 0 of N]" introduction, which describes the series as a whole. By default, grep only prints output for the first revision of a file in which it finds a match. To get it to print every revision that contains a change in match status ("-" for a match that becomes a non-match, or "+" for a non-match that becomes a match), use the --all flag. By default, push will not allow creation of new heads at the destination, since multiple heads would make it unclear which head to use. In this situation, it is recommended to pull and merge before pushing. By default, the revision used is the parent of the working directory; use -r/--rev to specify a different revision. By default, the server logs accesses to stdout and errors to stderr. Use the -A/--accesslog and -E/--errorlog options to log to files. By default, this command copies the contents of files as they exist in the working directory. If invoked with -A/--after, the operation is recorded, but no copying is performed. By default, this command searches all directories in the working directory. To search just the current directory and its subdirectories, use "--include .". CVS Source ########## Commit changes to the given files into the repository. Unlike a centralized SCM, this operation is a local operation. See :hg:`push` for a way to actively distribute your changes. Create a copy of an existing repository in a new directory. Differences between files are shown using the unified diff format. Each member added to an archive file has a directory prefix prepended. Use -p/--prefix to specify a format string for the prefix. The default is the basename of the archive, with suffixes removed. Each patch email has a Subject line of "[PATCH M of N] ...", using the first line of the changeset description as the subject text. The message contains two or three parts. First, the changeset description. File history is shown without following rename or copy history of files. Use -f/--follow with a filename to follow history across renames and copies. --follow without a filename will only show ancestors or descendants of the starting revision. Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further updates to the repository are allowed. The next commit will have two parents. Finally, the patch itself, as generated by :hg:`export`. For remote repository, using --bundle avoids downloading the changesets twice if the incoming is followed by a pull. Generate a compressed changegroup file collecting changesets not known to be in another repository. Given a topic, extension, or command name, print help for that topic. If -B/--bookmark is used, the specified bookmarked revision, its ancestors, and the bookmark will be pushed to the remote repository. If -a/--active is specified, only show active branches. A branch is considered active if it contains repository heads. If -c/--closed is specified, also show branch heads marked closed (see :hg:`commit --close-branch`). If -r/--rev is used, the specified revision and all its ancestors will be pushed to the remote repository. If -t/--topo is specified, named branch mechanics will be ignored and only changesets without children will be shown. If REV is the parent of the working directory, then this new changeset is committed automatically. Otherwise, hg needs to merge the changes and the merged result is left uncommitted. If SOURCE is omitted, the 'default' path will be used. See :hg:`help urls` for more information. If STARTREV is specified, only those heads that are descendants of STARTREV will be displayed. If a list of files is omitted, all changes reported by :hg:`status` will be candidates for recording. If a list of files is omitted, all changes reported by :hg:`status` will be committed. If no commit message is specified, Mercurial starts your configured editor where you can enter a message. In case your commit fails, you will find a backup of your message in ``.hg/last-message.txt``. If no destination directory name is specified, it defaults to the basename of the source with ``-hg`` appended. If the destination repository doesn't exist, it will be created. If no destination directory name is specified, it defaults to the basename of the source. If no directory is given, the current directory is used. If no names are given, add all files to the repository. If no patterns are given to match, this command prints the names of all files under Mercurial control in the working directory. If no revision is given, the parent of the working directory is used, or tip if no revision is checked out. If no revision is given, the parent of the working directory is used, or tip if no revision is checked out. If no revision is specified, the working directory's parent is a head revision, and the current branch contains exactly one other head, the other head is merged with by default. Otherwise, an explicit revision with which to merge with must be provided. If no revision range is specified, the default is ``tip:0`` unless --follow is set, in which case the working directory parent is used as the starting revision. If one or more REVs are given, only branch heads on the branches associated with the specified changesets are shown. This means that you can use :hg:`heads foo` to see the heads on a branch named ``foo``. If one revision is given, it is used as the base revision. If two revisions are given, the differences between them are shown. The --change option can also be used as a shortcut to list the changed files of a revision from its first parent. If option --all is specified, the list of all files from all revisions is printed. This includes deleted and renamed files. If you are committing the result of a merge, do not provide any filenames or -I/-X filters. If you have just made a commit, that commit will be the tip. If you have just pulled changes from another repository, the tip of that repository becomes the current tip. The "tip" tag is special and cannot be renamed or assigned to a different changeset. If you omit the destination repository, then hg assumes the destination will have all the nodes you specify with --base parameters. To create a bundle containing all changesets, use -a/--all (or --base null). If you supply a command, it will be used for automatic bisection. The environment variable HG_NODE will contain the ID of the changeset being tested. The exit status of the command will be used to mark revisions as good or bad: status 0 means good, 125 means to skip the revision, 127 (command not found) will abort the bisection, and any other non-zero exit status means the revision is bad. If you want to feed the output of this command into the "xargs" command, use the -0 option to both this command and "xargs". This will avoid the problem of "xargs" treating single filenames that contain whitespace as multiple filenames. If you want to revert just one file to an older revision, use :hg:`revert [-r REV] NAME`. In case email sending fails, you will find a backup of your series introductory message in ``.hg/last-email.txt``. Initialize a new repository in the given directory. If the given directory does not exist, it will be created. It is possible to specify an ``ssh://`` URL as the destination. See :hg:`help urls` for more information. List changes in files, showing the revision id responsible for each line List the repository's named branches, indicating which ones are inactive. If -c/--closed is specified, also list branches which have been marked closed (see :hg:`commit --close-branch`). Mark dest as copies of sources; mark sources for deletion. If dest is a directory, copies are put in that directory. If dest is a file, there can only be one source. Mark dest as having copies of source files. If dest is a directory, copies are put in that directory. If dest is a file, the source must be a single file. Mark the specified files so they will no longer be tracked after the next commit. Mercurial Destination ##################### Mercurial Source ################ Modified files are saved with a .orig suffix before reverting. To disable these backups, use --no-backup. Name a particular revision using . New files are ignored if they match any of the patterns in ``.hgignore``. As with add, these changes take effect at the next commit. Nodes printed as an @ character are parents of the working directory. Note that Mercurial will not let you commit files with unresolved merge conflicts. You must use :hg:`resolve -m ...` before you can commit after a conflicting merge. Only local paths and ``ssh://`` URLs are supported as destinations. For ``ssh://`` destinations, no working directory or ``.hg/hgrc`` will be created on the remote side. Option -q/--quiet hides untracked (unknown and ignored) files unless explicitly requested with -u/--unknown or -i/--ignored. Option -q/--quiet suppresses all output when searching for NAME and shows only the path names when listing all definitions. Output may be to a file, in which case the name of the file is given using a format string. The formatting rules are as follows: Output may be to a file, in which case the name of the file is given using a format string. The formatting rules are the same as for the export command, with the following additions: Path names are defined in the [paths] section of your configuration file and in ``/etc/mercurial/hgrc``. If run inside a repository, ``.hg/hgrc`` is used, too. Perforce Source ############### Please note that the server does not implement access control. This means that, by default, anybody can read from the server and nobody can write to it by default. Set the ``web.allow_push`` option to ``*`` to allow everybody to push to the server. You should use a real web server if you need to authenticate users. Please see :hg:`help urls` for important details about ``ssh://`` URLs. If DESTINATION is omitted, a default path will be used. Prepare a new changeset with the effect of REV undone in the current working directory. Print a list of version controlled files for the given revision. If no revision is given, the first parent of the working directory is used, or the null revision if no revision is checked out. Print a revision history alongside a revision graph drawn with ASCII characters. Print a summary identifying the repository state at REV using one or two parent hash identifiers, followed by a "+" if the working directory has uncommitted changes, the branch name (if not default), a list of tags, and a list of bookmarks. Print files under Mercurial control in the working directory whose names match the given patterns. Print the changeset header and diffs for one or more revisions. Print the revision history of the specified files or the entire project. Print the root directory of the current repository. Print the specified files as they were at the given revision. If no revision is given, the parent of the working directory is used, or tip if no revision is checked out. Print the working directory's parent revisions. If a revision is given via -r/--rev, the parent of that revision will be printed. If a file argument is given, the revision in which the file was last changed (before the working directory revision or the argument to --rev if given) is printed. Pull changes from a remote repository to a local one. Push changesets from the local repository to the specified destination. Recover from an interrupted commit or pull. Repository "heads" are changesets with no child changesets. They are where development generally takes place and are the usual targets for update and merge operations. Branch heads are changesets that have no child changeset on the same branch. Return 0 on success, 1 if no phases were changed or some could not be changed. Return 0 on success. Returns 0 if a match is found, 1 otherwise. Returns 0 if all files are successfully added. Returns 0 if import succeeded. Returns 0 if matching heads are found, 1 if not. Returns 0 if push was successful, 1 if nothing to push. Returns 0 if successful, 1 if nothing to recover or verify fails. Returns 0 if successful. Returns 0 if there are incoming changes, 1 otherwise. Returns 0 if there are outgoing changes, 1 otherwise. Returns 0 on success, 1 if an update had unresolved files. Returns 0 on success, 1 if an update has unresolved files. Returns 0 on success, 1 if any files fail a resolve attempt. Returns 0 on success, 1 if any warnings encountered. Returns 0 on success, 1 if errors are encountered. Returns 0 on success, 1 if no changes found. Returns 0 on success, 1 if no rollback data is available. Returns 0 on success, 1 if nothing changed. Returns 0 on success, 1 if there are unresolved files. Returns 0 on success. Returns 0 on success. Returns 0 on successful completion. Returns 0 on successful creation of a new patch. Returns 0. Schedule files to be version controlled and added to the repository. Schedule the indicated files for removal from the current branch. Search revisions of files for a regular expression. See :hg:`help dates` for a list of formats valid for -d/--date. See :hg:`help dates` for a list of formats valid for -d/--date. See :hg:`help qnew` & :hg:`help record` for more information and usage. See :hg:`help revisions` and :hg:`help revsets` for more about specifying revisions. See :hg:`help templates` for information on templates and filters. See :hg:`help templates` for more about pre-packaged styles and specifying custom templates. See :hg:`help urls` for details on specifying URLs. See :hg:`help urls` for more information. See pull for details of valid destination formats. Show changesets not found in the specified destination repository or the default push location. These are the changesets that would be pushed if a push was requested. Show definition of symbolic path name NAME. If no name is given, show definition of all available names. Show differences between revisions for the specified files. Show new changesets found in the specified path/URL or the default pull location. These are the changesets that would have been pulled if a pull at the time you issued this command. Show status of files in the repository. If names are given, only files that match are shown. Files that are clean or ignored or the source of a copy/move operation, are not listed unless -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. Unless options described with "show only ..." are given, the options -mardu are used. Since tag names have priority over branch names during revision lookup, using an existing branch name as a tag name is discouraged. Specifying a path to a repository root or Mercurial bundle will cause lookup to operate on that repository/bundle. Start a local HTTP repository browser and pull server. You can use this for ad-hoc sharing and browsing of repositories. It is recommended to use a real web server to serve a repository for longer periods of time. Subversion Source ################# Tag commits are usually made at the head of a branch. If the parent of the working directory is not a branch head, :hg:`tag` aborts; use -f/--force to force the tag commit to be based on a non-head changeset. Tags are used to name particular revisions of the repository and are very useful to compare different revisions, to go back to significant earlier versions or to mark branch points as releases, etc. Changing an existing tag is normally disallowed; use -f/--force to override. The archive type is automatically detected based on file extension (or override using -t/--type). The bundle file can then be transferred using conventional means and applied to another repository with the unbundle or pull command. This is useful when direct push and pull are not available or when exporting an entire repository is undesirable. The codes used to show the status of files are:: The current working directory is updated with all changes made in the requested revision since the last common predecessor revision. The exact name of the destination archive or directory is given using a format string; see :hg:`help export` for details. The files will be added to the repository at the next commit. To undo an add before that, see :hg:`forget`. The information shown in the changeset header is: author, date, branch name (if non-default), changeset hash, parent(s) and commit comment. The location of the source is added to the new repository's ``.hg/hgrc`` file, as the default to be used for future pulls. The tip revision (usually just called the tip) is the changeset most recently added to the repository (and therefore the most recently changed head). This command behaves differently than Unix grep. It only accepts Python/Perl regexps. It searches repository history, not the working directory. It always prints the revision number in which a match appears. This command helps to find changesets which introduce problems. To use, mark the earliest changeset you know exhibits the problem as bad, then mark the latest changeset which is free from the problem as good. Bisect will update your working directory to a revision for testing (unless the -U/--noupdate option is specified). Once you have performed tests, mark the working directory as good or bad, and bisect will either update to another candidate changeset or announce that it has found the bad revision. This command is deprecated, use :hg:`rebase` instead. This command is deprecated; use :hg:`commit --mq` instead. This command is not available when committing a merge. This command is not intended for use on public repositories. Once changes are visible for pull by other users, rolling a transaction back locally is ineffective (someone else may already have pulled the changes). Furthermore, a race is possible with readers of the repository; for example an in-progress pull from the repository may fail if a rollback is performed. This command is useful for discovering when a change was made and by whom. This command schedules the files to be removed at the next commit. To undo a remove before that, see :hg:`revert`. To undo added files, see :hg:`forget`. This command should be used with care. There is only one level of rollback, and there is no way to undo a rollback. It will also restore the dirstate at the time of the last transaction, losing any dirstate changes since that time. This command does not alter the working directory. This command takes effect at the next commit. To undo a rename before that, see :hg:`revert`. This command takes effect with the next commit. To undo a copy before that, see :hg:`revert`. This command tries to fix the repository status after an interrupted operation. It should only be necessary when Mercurial suggests it. This finds all changes from the repository at the specified path or URL and adds them to a local repository (the current one unless -R is specified). By default, this does not update the copy of the project in the working directory. This generates a brief summary of the working directory state, including parents, branch, commit status, and available updates. This lists both regular and local tags. When the -v/--verbose switch is used, a third column "local" is printed for local tags. This only removes files from the current branch, not from the entire project history, and it does not delete them from the working directory. This operation is symmetrical to pull: it is identical to a pull in the destination repository from the current one. This will perform an extensive check of the repository's integrity, validating the hashes and checksums of each entry in the changelog, manifest, and tracked files, as well as the integrity of their crosslinks and indices. To cancel an uncommitted merge (and lose your changes), use :hg:`update --clean .`. To check out a particular version, use -u/--update, or -U/--noupdate to create a clone with no working directory. To facilitate version control, distribution, and merging of tags, they are stored as a file named ".hgtags" which is managed similarly to other project files and can be hand-edited if necessary. This also means that tagging creates a new commit. The file ".hg/localtags" is used for local tags (not shared among repositories). To have the server choose a free port number to listen on, specify a port number of 0; in this case, the server will print the port number it uses. To pull only a subset of changesets, specify one or more revisions identifiers with -r/--rev or branches with -b/--branch. The resulting clone will contain only the specified changesets and their ancestors. These options (or 'clone src#rev dest') imply --pull, even for local source repositories. Note that specifying a tag will include the tagged changeset but not the changeset containing the tag. To undo a forget before the next commit, see :hg:`add`. To undo an uncommitted merge, use :hg:`update --clean .` which will check out a clean copy of the original merge parent, losing all changes. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. Unless -f/--force is specified, :hg:`phase` won't move changeset from a lower phase to an higher phase. Phases are ordered as follows:: Unless -f/--force is specified, branch will not let you set a branch name that already exists, even if it's inactive. Update the repository's working directory to the specified changeset. If no changeset is specified, update to the tip of the current named branch and move the current bookmark (see :hg:`help bookmarks`). Use --new-branch if you want to allow push to create a new named branch that is not present at the destination. This allows you to only create a new branch without forcing other changes. Use -C/--clean to reset the working directory branch to that of the parent of the working directory, negating a previous branch change. Use -f/--force to override the default behavior and push all changesets on all branches. Use :hg:`incoming` if you want to see what would have been added by a pull at the time you issued this command. If you then decide to add those changes to the repository, you should use :hg:`pull -r X` where ``X`` is the last changeset listed by :hg:`incoming`. Use null as the changeset to remove the working directory (like :hg:`clone -U`). Use the -g/--git option to generate diffs in the git extended diff format. For more information, read :hg:`help diffs`. Use the -g/--git option to generate diffs in the git extended diff format. See :hg:`help diffs` for more information. Use the -g/--git option to keep the patch in the git extended diff format. Read the diffs help topic for more information on why this is important for preserving permission changes and copy/rename information. Use the -s/--similarity option to detect renamed files. This option takes a percentage between 0 (disabled) and 100 (files must be identical) as its parameter. With a parameter greater than 0, this compares every removed file with every added file and records those similar enough as renames. Detecting renamed files this way can be expensive. After using this option, :hg:`status -C` can be used to check which files were identified as moved or renamed. If not specified, -s/--similarity defaults to 100 and only renames of identical files are detected. Use the command :hg:`update` to switch to an existing branch. Use the command :hg:`update` to switch to an existing branch. Use :hg:`commit --close-branch` to mark this branch as closed. Using the -r/--rev or -d/--date options, revert the given files or directories to their states as of a specific revision. Because revert does not change the working directory parents, this will cause these files to appear modified. This can be helpful to "back out" some or all of an earlier change. See :hg:`backout` for a related method. Valid types are: Verify the integrity of the current repository. When REV is not given, print a summary of the current state of the repository. When two revision arguments are given, then changes are shown between those revisions. If only one revision is specified then that revision is compared to the working directory, and, when no revisions are specified, the working directory files are compared to its parent. With --debug, the source (filename and line number) is printed for each config item. With -i/--inactive, the new bookmark will not be made the active bookmark. If -r/--rev is given, the new bookmark will not be made active even if -i/--inactive is not given. If no NAME is given, the current active bookmark will be marked inactive. With -v, print file permissions, symlink and executable bits. With --debug, print file revision hashes. With multiple arguments, print names and values of all config items with matching section names. With no argument, show the current branch name. With one argument, set the working directory branch name (the branch will not exist in the repository until the next commit). Standard practice recommends that primary development take place on the 'default' branch. With no argument, show the phase name of specified revisions. With no arguments, print a list of commands with short help messages. With no arguments, print names and values of all config items. With no arguments, show all repository branch heads. With no revision specified, revert the specified files or directories to the contents they had in the parent of the working directory. This restores the contents of files to an unmodified state and unschedules adds, removes, copies, and renames. If the working directory has two parents, you must explicitly specify a revision. With one argument of the form section.name, print just the value of that config item. With one of -p/--public, -d/--draft or -s/--secret, change the phase value of the specified revisions. With the --remote option, this will check the default paths for incoming and outgoing changes. This can be time-consuming. With the --switch-parent option, the diff will be against the second parent. It can be useful to review a merge. With the -d/--diffstat option, if the diffstat program is installed, the result of running diffstat on the patch is inserted. Without the -a/--text option, annotate will avoid processing files it detects as binary. With -a, annotate will annotate the file anyway, although the results will probably be neither useful nor desirable. Without the -a/--text option, diff will avoid generating diffs of files it detects as binary. With -a, diff will generate a diff anyway, probably with undesirable results. Without the -a/--text option, export will avoid generating diffs of files it detects as binary. With -a, export will generate a diff anyway, probably with undesirable results. You can change compression method with the -t/--type option. The available compression methods are: none, bzip2, and gzip (by default, bundles are compressed using bzip2). You can use :hg:`bookmark NAME` to set a bookmark on the working directory's parent revision with the given name. If you specify a revision using -r REV (where REV may be an existing bookmark), the bookmark is assigned to that revision. You will be prompted for whether to record changes to each modified file, and for files with multiple changes, for each change to use. For each query, the following responses are possible:: ``--tool`` can be used to specify the merge tool used for file merges. It overrides the HGMERGE environment variable and your configuration files. See :hg:`help merge-tools` for options. aliases: %s hg log -r "branch(default) and 1.5:: and not merge()" hg log -r "branch(default)" qnew creates a new patch on top of the currently-applied patch (if any). The patch will be initialized with any outstanding changes in the working directory. You may also use -I/--include, -X/--exclude, and/or a list of files after the patch name to add only changes to matching files to the new patch, leaving the rest as uncommitted modifications. # 'none' turns off all effects status.clean = none status.copied = none %s in %s should not have %s line endings - web - paths - collections Default: serve. [color] mode = terminfo [color] status.modified = blue bold underline red_background status.added = green bold status.removed = red bold blue_background status.deleted = cyan bold underline status.unknown = magenta bold underline status.ignored = black bold [email] from = My Name to = recipient1, recipient2, ... cc = cc1, cc2, ... bcc = bcc1, bcc2, ... reply-to = address1, address2, ... [extensions] # disabling extension bar residing in /path/to/extension/bar.py bar = !/path/to/extension/bar.py # ditto, but no path was supplied for extension baz baz = ! [extensions] foo = [extensions] myfeature = ~/.hgext/myfeature.py [mq] git = auto/keep/yes/no [mq] keepchanges = True [mq] secret = True [pager] pager = less -FRSX [paths] /projects/a = /srv/tmprepos/a /projects/b = c:/repos/b / = /srv/repos/* /user/bob = /home/bob/repos/** [phases] publish = False [ui] username = Firstname Lastname verbose = True [web] pygments_style =