<1 y!!#բ#43R--5= V dr''Ǥ(.$G#l!A_ȦO(]xN֧A%'g$˨lۨHh0FI.Ӯ](`7"S8?ٱjUM#;ӹK[ C?F,5[E~l rhm^d^a<};s jw$c%vzq{P>Y_RCQXCC9P}8L9 OD';,59b-LCH[T7-1?_e4FsZG:iXB9~>\ReeTR{$";G}4tRXh}A=A3TPcmhmVx=b-  C .dM=9O'o,FF "R%uCMK- >y   6 ( *? !j  1 N e {   6N32SBb xD*d/aY3v-XU"@cm dheJ?5 & 3> GQ`t  '"0*S*~   !)Ka v !, !9 I Ua w     91U0*E"Y)|$+&% -D (r +     !F'! n!&!!,! !!" ?"I"f":w""""##+#;#L#c#y#3#### $$8$N$_$u$$'$"$%$%*%2E%&x%*%"%% &'&B&`&~&&&'&&&$'<'+U'I''+'()/(Y(s(&y('((((+ )67)An)"))5)"*3A*(u*7*)*++"!+1D+v+*+ +<+,,.4,&c,F,F,4-$M-r-0--u. 0.1k@2*2424 3EA3#313+3B 4L4%[48414445S55=i666"6667!7777#8=88F8888l9 q9@~9 9B9C:R:h:o:#: :$: ::t<y<<<<H>>B>(4? ]?j?z????? ?? ?$?E#@i@ pA,}A ALAB-B4BB'C>(CgC4D9D=D&SDzD6DDDsDJEREO[EEE*E1E)Fi.i j%(jNj4ej"jjjjj<k<Ak~kk k kk(kk!l~[~z~~~~"~+.?.n $ 60DCu ɀ,3L+]+́ ,&%!Lnǂ$*# N-\6#  *%Kq'&+4'`/Յ")"Ad)w/ ("H4k χ &5M)k0ƈۈ )BZn*?!(+?kЊ/4F,]-)/((&Qx&Ҍ #"F![}-Ǎߍ 3EWvŽɎ'ڎ!!,C p ~<1 G8h  Ő А)ڐ-2 AK[$r đӑ  !A*c ϒ-*)T[ w53ԓ-'6^n$#Ɣ '29l.+͕! !<#^# =/V8ڗ< *08 i!w 0&ؘ==X5r!ʙ ۙ@Ii!~Cǚ )&1Xs&қ ,GYn+(Ӝ'$,F!`!(: %3B=a' Ǟ  * K)l*!)D*Z)ʠ('.V!v!395(>^9ע &$?#d  ӣ+!6N_}-ʤ,<UtХ !%G'_¦Ԧ!A$`"ȧ-8"L#o$ȨYܨ%6\u(3?Ea{ 7Ϫ.E9^&  ɫ%֫- HTm7ͬ""Ear!)߭,"9HV!#"#,"?*b36$58 n İְ 5 Kl4ԱA/BSm%òݲ),BUi+ʳ"%"*Md#t+/Ĵ#9 LY&w [.+K<w#=ض-#Dh!zͷ6߷*1A s="A"?0T3)ѹ/%+Qm!*5غ*'9$a6O" -0(^#żA5']{5н""(K_nv!Ǿ  "-;&iԿ &"?b*x*%$8#Os "#)$ < ]~#) !0# T u-( +L!h-25#h $!!,C KCl&%4E^z)%" 8"["l &4*5&`   &%Lj A!+3M&$(7+c ; ' ,!Jl u'2 - )6Kcr   $AZr%48!@#X|'%)(Dm#*1 3 Tbk#*/)  3&T{$ <Fbv*(%!<Z*z,?*= V)b# '# Kl-/-5c"$5$<#\5:():du +0-'C"Ux"&(8S#l+?%2X1x%7]&t 73!4P i<s)5)$?$d%$$. DRi!%# )0Z$a /!+B Y,e,%#+Co ~+55/L>|60#9Xiy."(>R n/{10)8Pm/!6Li)$@?Um%50-J,x%9X p{(">]{!*5!`'6 Kh})%AYk !;Oe } - @$$e0"!0:k 36.8#g3 #D^m%=++CBo81P2n&$"G&d)"#&,>)k  05@f&4" &3BR""!*&(-O}!(4 &E2Z2N@RPCG*/'Z(+3 &#(J3s/'1!sS ##*1N/33-1Cu,1(A.j$# s_O}\L*Ew'%  v1  h  )  w."sQ4C">Saqe#C(lrcM<EYO Y `!s"##7$>$%%m &[z''\(w ))a*j*h*Y+,,[-P-N=../ 00k1p82z2k$3[33[44J55u6 77[@8P808M:l:0Q;U<6<L=!\=2~=5=!=, >16>Ah>G>G>L:?E?B?,@;=@vy@ABjC:C.DD\@EEEFFbiGDGI<IxI?xJ^JKK#3LWM8NNYOIPP0Q?QRR+SST/UVW(WWXXYm[L]l]1^_4^[^^g_^X`{`3aabcdfdde-f g hiCj.ZjjjMk=k9 lFl'fl,lVlZmmmm%nCoOEoqoLpCTpq6qq(r!!sCsstt2tPtlt6duNuuvvyw2wSw x8x NxXxy*:yeyy/yay/z3Lz-zzVg{[{!|<||m } {}v}}~zee?ˀ8 D S] dn ~  Ɓ ܁4 9F'M/u-ӂ !)19 A NZw  ,҃ +D_ q |  ҄  %BE c=<… 2S.g "̆"$7W&v!$  %@NR$$ƈ3";%^ NÉ&1XmҊ79Tn(Ëً!!2T&p3̌1,2(_!"؍6Q9T 3ώ)GG-ڏ. 'H'N,v'45:R%!EՑ$C@-6-'&:1a* ړ?(;.S'RO9M!2ݖ`Km˚,94f7Sӛ!'3I1}O , M:8؝۝JiH6 %ƟƠʠ  *( SB^̡ @fb]ϣգ/ $) NhY¥ƥͥHʧI-6w ͨ -<&?+fR9:.iTrǫ)\:(ݬ?F38<,S;ڮiUdUtʯί+ӯ3*3^d 3-Ű/G(YHԱܱ*B_&} IJGѲHbkq3v8 +3"Il0^,)H2rcRojP-~!Y < Zd$94&n+1 F S;`<: 5 O ]:g 2 BX gr 6>Ys+ 5Pm I9"2B?uG>)<f-%&-0+.\9    !?$R0w<8$.+S&-?2&G.nCB<$;a8 "2Ha:w20'(Bk%,+ "-Lj>  79 q&~, (%%K1`#B@5v+4%5Oj|QO7Q b lz(!&# !0R;l*).!H(j5:(9C1}+.3 />0n2&6(S7|(1('+P.|-. ##D6hYHB']-.A7`//32,1_1.&*'D'lG(+;19mF,B!^,!"1,T  "@`;$@IZ%qB&67T;6H$ mz%\(\$'#02P  >%50Iz &+-)*W=-&,< Q^s# .Q:J0i,/B[ w*1!$!=_*p ':0/F`5!!%)Od8}&B/[."/"@c)}+!*-X:w%!%:`p!7!0CS j+B'G g0%%%>$VC{.,.Kz,"70Nh*#!7+O{-Lb{*#6M \j?5(36\ 4+' S _iz'   /!F&h*' -43b 515G-}%#8 Xy45+(!T v!!" #  C d   2  9 F ;\  2  %  4 )P <z   5 !( J  [ "h @   " $ , BK #  ( "  4U#i(/ '*H-s* "%#6Z,y;&<*+g -&+T.)(Cl""$(D5m<;>3[!++& #0Tm u&'''Ow3*"Eh& 4U-j54j#  -1K+d# a$\.8B4w" 9 FbzB'  '3([1 D b  & 8  !1!%C!i!3|!!7!" "O6" "("%"%"#.#.M#5|#;#3#"$<?$%|$$$$$$ %:%R%p%,%%?% &6&UP&&&&& ''('P'p'-''''((64( k((+(*(%)')F))]).)1)!) * *8*M*"\*1** *i*8E+$~+F+$+M,.],),,*,5,+-=-CN-+-7- -K.$N.Qs.#..=/@/:]/'/6/#/0"50(X010C090&11#X14|1U1%25-2(c2%22!2N2(A3%j3%3A3'3 4$=4(b444 444,4#5 @5J5i5555&556/6#M6q6#66(66>71T7077 7718F8U8!t8&8/8,89&99`9'u9C9 99) :14:%f:::#:(:!:+ ;(L;u;-;!;.;&<8<K<g<:<,<(<,=-B=/p=7= ==J>%M>s>>*> >>>?+1?(]?? ??U?@$(@!M@o@@2@?@1A,BA oA+AA!AAB &B GBhBBBB BBAB 6C8WCC$C1C+D.D?ID%DDED D E)(E-RE$E*E EEE' F55FkF,|F FFFFFG#GCGVGjGsGGGGGG,H>3HBrH HH.H!I+@I%lIIII.I$I JAJTJ'lJ8J5J%K)KQ-oQ6Q$Q#QR$R#5R>YR4R%R,R S4S:OS7SS'SS TT%%T3KT-TTT*T U$'ULUhU!U+UUU"V'VDV+]V=V#VV/ W:WSWlWWWWWW&X )X96X:pX)XXX Y9YVY(hY6YY'Y(Z'-Z-UZZ&Z1ZZ$ [#/[*S[+~["[$['[+\F\2M\\ \2\\"\' ]H] X](c] ]5]])]^&7^'^^^ ^,^^__5-_c_5}_7_4_< `]`'s```$`2`"a'8a=`a"a a1a1a01b@bbb(b'b/cCc bcc!cc c%cc,d'Jd<rd8d#d e"&e2Ie |e"eee.e4#f*Xf+ff f.f2gJg gg"rgg'gggh(-h(Vh!h#hh hi!i4iLi-ii&i&iij?j ]jGjj jjjjjk k$1kVkqkkkkkkkl%l:lOljlll(l ll2l&0mWmJkm'm6m&nr@rBrcs;rs&s1s"t*t9}}/~>M~.?O T4z@GhYVd )pm{ <hX"(1Cl{I?<f'rfc H>w-L?^h G/<|F^m8z#{:Z"~ )y&/bL^o|*-<)5Us_XY.DT}wW?,X uIYBK+X 0}sK%/]z6u^'9dt7 &$.Np0 t7vg,5%'IrDt+xkRM =O qTaK(%K8D8|[ -^=CJHHr, a)+ nZ=D*S_Lo8 ` jQ|5l0!qLmO8L*p2Nm8P!R"b_kqBha$W!Q$0 %)WQ56N|d&PG>0e}>sn6cMR_c'e-U&*-&N`$\E1cGU^:+!>q:n\@HYQISAco jvmbQ RUqPCS 9zJ~raN X#<<Gai:VV#jXpiW#)Cj/]%*[*2M9:ebGI/9yy:A2* V gfCE_q6[ehwb+yR(lP`eof^tsJ.hW'. B_U?xiSaqW=Lv@`.W41ya3~<3T 9ACt}QY[`7]F o9tAyFPJsSWAkTluO sjT-+VZnwd jE[`g/pn-B~8;xUA ;ZEk"{n~Ru;FGfgBe1<64!#]J MG= Jp+ Ktd\Q" V:*)bmZldI-pZJ[(iv$u%L;.5y \?n43[/f\@H#kTA\D\Zv5 B!38sUB;?!6a@pEcO%51|fh{9be(2}e09Yz~7FzXLz]:\Pi_j&@f$Sw2xImx= SKN4Hd,3w@g44Fb~1gRk?kmAr# FUOg761t oF,}}"P&i{Mw7@'l,0E(rzM}kPuK0E7D$^{xs/(vS qH(l;_.,>|yN132V~7`[gx>B=Q3Mx=  O6wMn52]i#;ro E3oTC]hH%ZJ  "RO;NVu|vYi)c+4 l&j$,D'I]XdvD'"K2{ Y>`c>u!Cr disabling current template maps extending current template maps overriding default cvs keywordset overriding default svn keywordset configuration using current keyword template maps configuration using custom keyword template maps configuration using default cvs keywordset configuration using default svn keywordset keywords expanded Final summary: Write the introductory message for the patch series. additional help topics: aliases: %s broken pipe diffs (%d lines): diffs (truncated from %d to %d lines): keywords written to %s: use "hg -v help %s" to show more info hg clone http://selenic.com/hg hg log -r "a21ccf and ancestor(1.9)" hg log -r "bisect(pruned)" hg log -r "bisect(range)" $ ls foo.c $ hg status ? foo.c $ hg add adding foo.c $ hg status A foo.c $ cp -al REPO REPOCLONE qguard foo.patch -- -stable (negative guard) qguard bar.patch +stable (positive guard) qselect stable An example showing how new (unknown) files are added automatically by :hg:`add`:: # display activity of developers by month hg churn -f '%Y-%m' -s -c # display count of changed lines for every committer hg churn -t '{author|email}' # display count of lines changed in every year hg churn -f '%Y' -s # display daily activity graph hg churn -f '%H' -s -c (transplanted from CHANGESETHASH) = ? - display help Examples: 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: Some examples: 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. 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 hg qguard other.patch -- +2.6.17 -stable s - skip remaining changes to this file f - record remaining changes to this file source author = destination author y - record this change n - skip this change $ hg log -r1 --style changelog $ hg log -r1 --template "{node}\n" b56ce7b07c52de7d5fd79fb89701ea538af65746 %s - Mercurial [hg] - CVS [cvs] - Darcs [darcs] - git [git] - Subversion [svn] - Monotone [mtn] - GNU Arch [gnuarch] - Bazaar [bzr] - Perforce [p4] .. container:: verbose .. 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:: 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. 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. :``%%``: 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 :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. An existing changeset may be placed under mq control with -r/--rev (e.g. qimport --rev tip -n patch will place tip under mq control). With -g/--git, patches imported with --rev will use the git diff format. See the diffs help topic for information on why this is important for preserving rename/copy information and permission changes. Use :hg:`qfinish` to remove changesets from mq control. 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 bookmark names in :hg:`merge` and :hg:`update` to merge and update respectively 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, pops off the top of the patch stack. If given a patch name, keeps popping off patches until the named patch is at the top of the stack. By default, the server logs accesses to stdout and errors to stderr. Use the -A/--accesslog and -E/--errorlog options to log to files. 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. Examples:: 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. Guards control whether a patch can be pushed. A patch with no guards is always pushed. A patch with a positive guard ("+foo") is pushed only if the :hg:`qselect` command has activated it. A patch with a negative guard ("-foo") is never pushed if the :hg:`qselect` command has activated it. Host *.mylocalnetwork.example.com Compression no Host * Compression yes 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 -s/--short is specified, files currently included in the patch will be refreshed just like matched files and remain in the patch. If SOURCE is omitted, the 'default' path will be used. See :hg:`help urls` for more information. 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 a parent of the working directory is stripped, then the working directory will automatically be updated to the most recent available ancestor of the stripped parent after the operation completes. If any file patterns are provided, the refreshed patch will contain only the modifications that match those patterns; the remaining modifications will remain in the working directory. 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 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 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 you are committing the result of a merge, do not provide any filenames or -I/-X filters. Initialize a new repository in the given directory. If the given directory does not exist, it will be created. It is possible to map alternate email addresses to a main address by providing a file using the following format:: 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 the specified files so they will no longer be tracked after the next commit. 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. Option -q/--quiet hides untracked (unknown and ignored) files unless explicitly requested with -u/--unknown or -i/--ignored. 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: Please see :hg:`help urls` for important details about ``ssh://`` URLs. If DESTINATION is omitted, a default path will be used. Print a revision history alongside a revision graph drawn with ASCII characters. Print the changeset header and diffs for one or more revisions. Print the children of the working directory's revisions. If a revision is given via -r/--rev, the children of that revision will be printed. If a file argument is given, revision in which the file was last changed (after the working directory revision or the argument to --rev if given) is printed. Print the revision history of the specified files or the entire project. 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. Prints the list of directories being watched by the inotify server. Pull changes from a remote repository to a local one. Push changesets from the local repository to the specified destination. Return 0 on success. Returns 0 if import succeeded. Returns 0 on success, 1 if errors are encountered. Returns 0 on success. Returns 0 on successful completion. Returns 0 on successful creation of a new patch. Run after (re)enabling keyword expansion. Schedule files to be version controlled and added to the repository. 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 urls` for details on specifying URLs. See :hg:`help urls` for more information. Show differences between revisions for the specified files. 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. Shows a diff which includes the current patch as well as any changes which have been made in the working directory since the last refresh (thus showing what the current patch would become after a qrefresh). Statistics are based on the number of changed lines, or alternatively the number of matching revisions if the --changesets option is specified. Such a file may be specified with the --aliases option, otherwise a .hgchurn file will be looked for in the working directory root. 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 files will be added to the repository at the next commit. To undo an add before that, see :hg:`forget`. The following rules apply when the working directory contains uncommitted changes: 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 patch is inserted into the series after the last applied patch. If no patches have been applied, qimport prepends the patch to the series. The patch will have the same name as its source file unless you give it a new one with -n/--name. The queue repository is unversioned by default. If -c/--create-repo is specified, qinit will create a separate nested repository for patches (qinit -c may also be run later to convert an unversioned patch repository into a versioned one). You can use qcommit to commit changes to this queue repository. This activates the "stable" guard. mq will skip foo.patch (because it has a negative match) but push bar.patch (because it has a positive match). This command is deprecated, use :hg:`rebase` instead. This command is deprecated. Without -c, it's implied by other relevant commands. With -c, use :hg:`init --mq` instead. This command is deprecated; use :hg:`commit --mq` instead. This command is useful for discovering when a change was made and by whom. 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 will display a histogram representing the number of changed lines or revisions, grouped according to the given template. The default template will group changes by author. The --dateformat option may be used to group the results by date instead. 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 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 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 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 import a patch from standard input, pass - as the patch file. When importing from standard input, a patch name must be specified using the --name flag. To set guards on another patch:: To undo a forget before the next commit, see :hg:`add`. 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. Use -C/--clean to reset the working directory branch to that of the parent of the working directory, negating a previous branch change. Use -n/--none to deactivate guards (no other arguments needed). When no guards are active, patches with positive guards are skipped and patches with negative guards are pushed. Use -s/--series to print a list of all guards in the series file (no other arguments needed). Use -v for more information. Use :hg:`diff` if you only want to see the changes made since the last qrefresh, or :hg:`export qtip` if you want to see changes made by the current patch without including changes made since the qrefresh. 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. With a parameter greater than 0, this compares every removed file with every added file and records those similar enough as renames. This option takes a percentage between 0 (disabled) and 100 (files must be identical) as its parameter. 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. Use the :hg:`qguard` command to set or print guards on patch, then use qselect to tell mq which guards to use. A patch will be pushed if it has no guards or any positive guards match the currently selected guard, but will not be pushed if any negative guards match the current guard. For example:: 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. Verify the integrity of the current repository. When -f/--force is applied, all local changes in patched files will be lost. With -f/--force, an existing patch of the same name will be overwritten. 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 arguments, print the currently active guards. With arguments, set guards for the named patch. With no arguments, prints the currently active guards. With one argument, sets the active guard. With one argument, renames the current patch to PATCH1. With two arguments, renames PATCH1 to PATCH2. With the --switch-parent option, the diff will be against the second parent. It can be useful to review a merge. 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 register an existing patch inside the patch directory with the -e/--existing flag. 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:: [bugzilla] bzurl=http://my-project.org/bugzilla user=bugmail@my-project.org password=plugh version=xmlrpc bzemail=bugzilla@my-project.org template=Changeset {node|short} in {root|basename}. {hgweb}/{webroot}/rev/{node|short}\n {desc}\n strip=5 [bugzilla] bzurl=http://my-project.org/bugzilla user=bugmail@my-project.org password=plugh version=xmlrpc template=Changeset {node|short} in {root|basename}. {hgweb}/{webroot}/rev/{node|short}\n {desc}\n strip=5 [bugzilla] host=localhost password=XYZZY version=3.0 bzuser=unknown@domain.com bzdir=/opt/bugzilla-3.2 template=Changeset {node|short} in {root|basename}. {hgweb}/{webroot}/rev/{node|short}\n {desc}\n strip=5 [extensions] bugzilla = [usermap] user@emaildomain.com=user.name@bugzilladomain.com [web] baseurl=http://my-project.org/hg aliases: %s hg add/remove/copy/rename work as usual, though you might want to use git-style patches (-g/--git or [diff] git=1) to track copies and renames. See the diffs help topic for more information on the git diff format. hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tagged())" hg log -r "1.3::1.5 and keyword(bug) and file('hgext/*')" hg log -r "branch(default) and 1.5:: and not merge()" hg log -r "branch(default)" hg log -r "head() and not closed()" hg log -r "sort(date('May 2008'), user)" kwexpand refuses to run if given files contain local changes. kwshrink refuses to run if given files contain local changes. qselect can change the guards on applied patches. It does not pop guarded patches by default. Use --pop to pop back to the last applied patch that is not guarded. Use --reapply (which implies --pop) to push back to the current patch afterwards, but skip guarded patches. ssh://example.com//tmp/repository $ hg tip --template "{date|isodate}\n" 2008-08-21 18:22 +0000 # 'none' turns off all effects status.clean = none status.copied = none # add new command called meld, runs meld (no need to name twice) meld = # add new command called vdiff, runs kdiff3 vdiff = kdiff3 # add new command called vimdiff, runs gvimdiff with DirDiff plugin # (see http://www.vim.org/scripts/script.php?script_id=102) Non # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in # your .vimrc vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)' $ cd test $ hg serve $ hg paths zc-test = http://example.com:8000/test $parent1, $plabel1 - filename, descriptive label of first parent $child, $clabel - filename, descriptive label of child revision $parent2, $plabel2 - filename, descriptive label of second parent $root - repository root $parent is an alias for $parent1. %s in %s should not have %s line endings - web - paths - collections -f -> ::. -d x -> date(x) -k x -> keyword(x) -m -> merge() -u x -> user(x) -b x -> branch(x) -P x -> !::x -l x -> limit(expr, x) .hgtags = release_engineer [acl.allow.branches] [acl.deny.branches] [collections] /foo = /foo [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 [decode] ** = cleverdecode: # or ** = macdecode: [diff-tools] kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child [extdiff] # add new command that runs GNU diff(1) in 'context diff' mode cdiff = gdiff -Nprc5 ## or the old way: #cmd.cdiff = gdiff #opts.cdiff = -Nprc5 [extdiff] kdiff3 = [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 [extensions] win32text = [encode] ** = cleverencode: # or ** = macencode: [hgk] path=/location/of/hgk [hgk] vdiff=vdiff [hooks] [interhg] issues = s!issue(\d+)!issue\1! bugzilla = s!((?:bug|b=|(?=#?\d{4,}))(?:\s*#?)(\d+))!\1!i boldify = s!(^|\s)#(\d+)\b! #\2! [mq] git = auto/keep/yes/no [pager] ignore = version, help, update [pager] pager = less -FRSX [pager] quiet = True [paths] alias1 = URL1 alias2 = URL2 ... [patterns] **.py = native **.vcproj = CRLF **.txt = native Makefile = LF **.jpg = BIN [repository] native = LF [schemes] gcode = http://{1}.googlecode.com/hg/ [schemes] py = http://code.python.org/hg/ [schemes] py = http://hg.python.org/ bb = https://bitbucket.org/ bb+ssh = ssh://hg@bitbucket.org/ gcode = https://{1}.googlecode.com/hg/ kiln = https://{1}.kilnhg.com/Repo/ [ui] username = Firstname Lastname verbose = True [web] # If you want hyperlinks (optional) baseurl = http://server/path/to/repo [web] pygments_style =