Mercurial·Ö²¼Ê½°æ±¾¿ØÖÆϵͳÊÇÒ»ÖÖÇáÁ¿¼¶·Ö²¼Ê½°æ±¾¿ØÖÆϵͳ£¬²ÉÓÃPythonÓïÑÔʵÏÖ£¬±ãÓÚѧϰºÍ²Ù×÷£¬Óзdz£Ç¿´óµÄÀ©Õ¹ÐÔ¡£Èí¼þÓÐ×ÅÓѺõĽçÃ棬²Ù×÷·Ç³£¼òµ¥£¬Éè¼ÆµÄ·Ç³£ÈËÐÔ»¯¡£¡£
Ïà¹ØÈí¼þÈí¼þ´óС°æ±¾ËµÃ÷ÏÂÔصØÖ·
±à³Ìè63.5Mv1.6.5¹Ù·½°æ²é¿´
±à³Ìè¸ñʽ¹¤³§45.6Mv2.7.2¹Ù·½°æ²é¿´
±à³ÌèѵÁ·Ê¦104.7Mv2.0.2¹Ù·½°æ²é¿´
Mercurial(·Ö²¼Ê½°æ±¾¿ØÖÆϵͳ)ÊÇÒ»ÖÖÇáÁ¿¼¶·Ö²¼Ê½°æ±¾¿ØÖÆϵͳ£¬²ÉÓà Python
ÓïÑÔʵÏÖ£¬±ãÓÚѧϰºÍ²Ù×÷£¬Óзdz£Ç¿´óµÄÀ©Õ¹ÐÔ¡£Èí¼þÓÐ×ÅÓѺõĽçÃ棬²Ù×÷·Ç³£¼òµ¥£¬Éè¼ÆµÄ·Ç³£ÈËÐÔ»¯¡£
¡¾»ù±¾¼ò½é¡¿
mercurialÊÇ¿îÇáÁ¿¼¶µÄ·Ö²¼Ê½°æ±¾¿ØÖÆϵͳ£¬mercurial¹Ù·½°æ(·Ö²¼Ê½°æ±¾¿ØÖÆϵͳ)²ÉÓÃpythonÓïÑÔ¿ª·¢£¬±ãÓÚѧϰºÍ²Ù×÷£¬Óзdz£Ç¿´óµÄÀ©Õ¹ÐÔ£¬ÆäÊÇ»ùÓÚ
GNU General Public License (GPL)
ÊÚȨµÄ¿ªÔ´ÏîÄ¿¡£¸Ã¿îÈí¼þÓÐ×ÅÓѺõĽçÃ棬²Ù×÷·Ç³£¼òµ¥£¬Éè¼ÆµÄ·Ç³£ÈËÐÔ»¯£¬Ó봫ͳµÄ¼¯ÖÐʽ°æ±¾¿ØÖÆϵͳÏà±È£¬ËüµÄÓŵãÊǸü¼Ó·½±ãÄãµÄ¹ÜÀíºÍʹÓá£
Ïà¡£
¸üÇáËɵĹÜÀí
´«Í³µÄ°æ±¾¿ØÖÆϵͳʹÓü¯ÖÐʽµÄ repository£¬Ò»Ð©ºÍ
repositoryÏà¹ØµÄ¹ÜÀí¾ÍÖ»ÄÜÓɹÜÀíÔ±Ò»¸öÈ˽øÐС£ÓÉÓÚ²ÉÓÃÁË·Ö²¼Ê½µÄÄ£ÐÍ£¬Mercurial ÖоÍûÓÐÕâÑùµÄÀ§ÈÅ£¬Ã¿¸öÓû§¹ÜÀí×Ô¼ºµÄ
repository£¬¹ÜÀíÔ±Ö»Ðèе÷ͬ²½ÕâЩrepository¡£
¸ü½¡×³µÄϵͳ
·Ö²¼Ê½ÏµÍ³±È¼¯ÖÐʽµÄµ¥·þÎñÆ÷ϵͳ¸ü½¡×³£¬µ¥·þÎñÆ÷ϵͳһµ©·þÎñÆ÷³öÏÖÎÊÌâÕû¸öϵͳ¾Í²»ÄÜÔËÐÐÁË£¬·Ö²¼Ê½ÏµÍ³Í¨³£²»»áÒòΪһÁ½¸ö½Úµã¶øÊܵ½Ó°Ïì¡£
¶ÔÍøÂçµÄÒÀÀµÐÔ¸üµÍ
ÓÉÓÚͬ²½¿ÉÒÔ·ÅÔÚÈÎÒâʱ¿Ì½øÐУ¬Mercurial ÉõÖÁ¿ÉÒÔÀëÏß½øÐйÜÀí£¬Ö»ÐèÔÚÓÐÍøÂçÁ¬½Óʱͬ²½¡£
ÒÔÏÂʹÓôó¶à»ùÓÚÃüÁîÐÐÐÎʽ£¬°æ±¾ÊÇ1.2.11
ÒòΪ±¾µØ¼´ÊÇ°æ±¾¿âµÄ·þÎñ¶ËÒ²ÊÇ°æ±¾¿âµÄ¿Í»§¶Ë£¬ËùÒÔÊ×ÏȵÃÇø·ÖºÃ°æ±¾¿âºÍ¹¤×÷Ŀ¼Á½¸ö¸ÅÄ°æ±¾¿â´æ·ÅÁËËùÓеİ汾£¬¹¤×÷Ŀ¼ֻÊÇij¸öÌض¨µÄ°æ±¾£¬Õâ¸ö¸ÅÄîͬsvnÊÇÒ»Öµģ¬Ö»ÊÇsvnµÄ°æ±¾¿â²»ÔÚ±¾µØ£¬¶øÔÚ¼¯ÖеÄһ̨·þÎñÆ÷ÉÏ¡£
hg init ´´½¨Ð²ֿ⣬°æ±¾¿âµÄÎļþ·ÅÔÚÒ»¸ö.hgµÄÎļþ¼ÐÏÂÃæ
hg add Ìí¼Óδ°æ±¾»¯µÄÎļþ
hg commit Ìá½»Ð޸ģ¬Ê¹ÓÃ-m Ìîдcomments£¬Í¬svnÊÇÒ»ÑùµÄ
hg tip ²é¿´µ±Ç°°æ±¾¿âµÄ×îа汾£¬×¢Ò⣺²»Êǵ±Ç°¹¤×÷Ŀ¼µÄ×îа汾¡£tipÊÇ°æ±¾¿â×îа汾µÄÒâ˼
hg
parents²é¿´µ±Ç°¹¤×÷Ŀ¼µÄ×îа汾£¬Èç¹ûÕâ¸ö°æ±¾Óжà¸öparent£¬»áÏÔʾ³öÀ´£¬Èç¹ûûÓÐÔò²»ÏÔʾ¡£parentÊÇָij¸ö°æ±¾µÄÇ°Ò»¸ö°æ±¾£¬Èç¹ûij¸ö°æ±¾Í¨¹ýÁ½¸ö°æ±¾merge¶øÀ´£¬Ôò»á³öÏÖ¶à¸öparents¡£mercurial»¹²»Ö§³Ö³¬¹ýÁ½¸öµÄparents£¬Ò²¾ÍÊÇ˵ֻÄܽ«°æ±¾Á½¸öÁ½¸öµÄºÏ²¢£¬ºÏ²¢3¸ö°æ±¾ÐèÒª²Ù×÷2´Î£¬ºÏ²¢4¸ö°æ±¾ÐèÒª²Ù×÷3´Î£¬ÒÀ´ÎÀàÍÆ£¬Èç¹ûÅöµ½8¸ö°æ±¾ÐèÒªºÏ²¢£¬ÔòÐèÒªºÏ²¢7´Î...
hg clone ¿Ë¡һ¸ö°æ±¾¿âµ½±¾µØ£¬µ±ÏîÄ¿¿ªÊ¼µÄʱºò£¬½¨ÒéÔÚһ̨µçÄÔÉÏinitÏîÄ¿ºó£¬È»ºó´ó¼Ò´ÓËûÄÇclone³öÀ´£¬¶ø²»ÊǸ÷×Ôinit¡£
hg pull ´ÓÁíÒ»¸ö°æ±¾¿â¸üа汾µ½±¾µØ
hg push
½«±¾µØ°æ±¾¿â¸üе½ÆäËû°æ±¾¿âÖУ¬ÆäËû°æ±¾¿âÐèÒª¿ªÍ¨ssh·þÎñ£¬WindowsÏÂÐèÒªcygwinÀ´Æô¶¯ssh£¬linuxÏÂÓÃopensshʵÏÖ¡£Windows¿Í»§¶ËÁ¬½Óssh·þÎñÆ÷ʱ£¬ÐèÒªÔÚmercurial.iniµÄui¶ÎÅäÖã¬ÈçÏÂ
[ui]
ssh = "C:\Program Files\TortoiseHg\TortoisePlink.exe"
putty.exe ÎÞ·¨ÅäºÏhgʹÓá£
TortoisePlink.exe¶ÔÓÚ ssh://xx/ Ö®ºóµÄ·¾¶ÐèÒªÔÙ¼ÓÒ»¸ö"/" ÒÔʾ¸ù·¾¶£¬ÈçÏ£º
ssh://192.168.107.129//home/arthur/hg/hello
hg incoming ½«±¾µØ°æ±¾¿âͬÆäËû°æ±¾¿â½øÐбȽϣ¬¿´¿´ÓÐÄÄЩchangesetÔÚÆäËû°æ±¾¿âÖпÉÒÔpull¹ýÀ´
hg outgoing ½«±¾µØ°æ±¾¿âͬÆäËû°æ±¾¿â½øÐбȽϣ¬¿´¿´ÓÐÄÄЩchangeset¿ÉÒÔpushµ½ÆäËû°æ±¾¿âÖÐ
hg update
¸üй¤×÷Ŀ¼£¬Ä¬ÈϲÎÊýÊÇtip£¬²ÎÊýÒ²¿ÉÒÔÊÇ°æ±¾ºÅ¡¢tagÃû×Ö¡¢branchÃû×Ö¡£svnÖеÄÇл»branch/tagͨ¹ýÕâ¸öÃüÁîÀ´ÊµÏÖ
hg tag Öƶ¨Ò»¸öÓÀ¾ÃµÄ°æ±¾ºÅ
hg branch ÏÔʾµ±Ç°branch£¬»òÕßн¨Ò»¸öbranch£¬Ä¬ÈϵÄbranchÃû×ÖÊÇdefault¡£
hg diff ¶Ô±È°æ±¾¼äµÄ²îÒì
hg merge ºÏ²¢°æ±¾µ½µ±Ç°¹¤×÷Ŀ¼£¬hg pullÖ®ºó»áÌáʾhg update,hg updateÖ®ºóÈç¹ûÌáʾhg
merge£¬ÕâʱºòµÄmergeÊÇÔÚ×îа汾µÄ»ù´¡ÉϽøÐеÄmerge£¬mergeÖ®ºóËù×÷µÄÐÞ¸ÄÐèҪͨ¹ýcommitÀ´Éú³Éеİ汾ºÅ¡£
ºÏ²¢branch : hg merge branchname £¬ÏÈÈ·ÈÏhg branchÊÇʲôÔÙÖ´ÐÐÕâ¸öÃüÁî¡£
µ±Ò»¸öbranchµÄÀúʷʹÃüÍê³ÉµÄʱºò£¬ÕâʱºòÐèÒª¾ö¶¨ÊÇ»ùÓÚÕâ¸öbranchпªÒ»¸öbranch£¬»¹ÊÇÔÚij¸ö֮ǰµÄ°æ±¾¿ªÁ¢branch.
defaultÊÇÒ»¸öûÓд´Á¢ÈκÎbranchʱµÄĬÈÏbranchÃû×Ö¡£
Èç¹ûÏ£Íû¼ÌÐø¹¤×÷ÔÚdefault branchÏ£¬ÔòÐèÒªÏÈhg update
default,È»ºóÔÙ¿¼ÂÇÐèÒªºÏ²¢ÄÄЩ°æ±¾µ½defaultÀïÃ棬֮ºó¾Í¿ÉÒÔÔÚdefaultÏÂÒ»Ö±¹¤×÷ÁË¡£
¶ÔÓÚ¿ªÁ˶à¸öbranchÐèÒªºÏ²¢µ½defaultʱ£¬ÐèÒªÒ»¸ö¸öbranchÀ´ºÏ²¢£¬ÖîÈçÕâÑù:
hg merge foo
hg merge bar
hg ci -m "merge foo and bar to default
"
ÔÚwindowsÏ£¬Èç¹û°²×°ÁËbeyond compare£¬»á×Ô¶¯±»µ÷ÓóöÀ´¡£
ÏÔʾÈý¸ö´°¿Ú£º±¾µØÎļþ¡¢»ùÎļþ((ÔÚ·ÖÖ§·Ö¿ªÇ°µÄ×îºóÒ»¸ö°æ±¾))¡¢ÆäËûÎļþ(ÍâÀ´µÄÎļþ)¡£ÕâÖֺϲ¢Ä£Ê½Í¬svnÊÇÒ»ÑùµÄ¡£
merge×öÍêÖ®ºó£¬ÐèÒªhg ciÌá½»Ð޸ģ¬Õâʱ¿ÉÒÔ¿´µ½tip ÐÅÏ¢ÖеÄparentÓÐÁ½¸ö£¬±íÃ÷ÊÇ´ÓÁ½¸ö°æ±¾ÖÐmerge¹ýÀ´µÄ¡£
beyond compare¶ÔÓÚ³åÍ»ÓÐÈý¸ö»ù±¾Ñ¡ÏTake left, take center, take
right£¬·Ö±ð¶ÔÓ¦ÒÔÉÏÈý¸öÎļþµÄÄÚÈÝ¡£»¹ÓÐÆäËû¼¸¸öÑ¡ÏîÒ²ºÜÈÝÒ×Ã÷°×¡£Óгåͻʱ»¹¿ÉÄÜÐèÒªÊÖ¹¤ÊäÈëÄÚÈÝ¡£
ÁíÍ⣬Èç¹ûÎÒÃÇûÓа²×°Í¼Ðκϲ¢³ÌÐò£¬ ÎÒÃǾͻῪÆôÎı¾±à¼Æ÷À´·ÃÎÊÐèÒªºÏ²¢µÄÎļþ¡£ÓÃÊÖ¹¤À´×öÕâЩÊÂÇéÊǷdz£ÈÝÒ׳ö´í²¢ÇÒ·±ËöµÄ¡£
×îºÃÊÇÍ˳ö±à¼Æ÷²¢ÓÃhg rollbackÖ¸ÁîÀ´Çå³ý["Pull"]´øÀ´µÄ¸Ä±ä£¬È»ºó°²×°ºÏ²¢³ÌÐò£¬ÔÙ×öÒ»´Î¡£
hg headsheadÖ¸µÄÊÇûÓжù×ÓchanesetµÄchangeset£¬Ò²¾ÍÊÇ°æ±¾Ê÷µÄÒ¶×ӽڵ㣬¶à¸öÒ¶×Ó½Úµã¿ÉÒÔ½øÐкϲ¢ÎªÒ»¸öÒ¶×Ó£¬
branchheadsÖ¸ÄÇЩ¸øÁËtagµ«»¹Ã»Óжù×ÓchangesetµÄchangeset¡£ ÓÃhg headsÏÔʾµ±Ç°¿âËùÓеÄheads
,Èç¹û´æÔÚ¶à¸öheadsÔò˵Ã÷ÓжàÌõ²¢Ðпª·¢µÄ·¾¶£¬ÕâʱÐèÒª¿¼ÂÇÊÇ·ñÐèÒªºÏ²¢¡£
hg serve -n "hellohg" -p 80 ÔËÐÐÍøÂç·þÎñ¡£Ö®ºó¿ÉÒÔͨ¹ýhg pull
À´ÏÂÔØÕâ¸ö°æ±¾¿â¡£ÕâÊÇÒ»¸öÁÙʱÐԵıã½ÝµÄÌṩpull°æ±¾¿â·þÎñµÄ·½·¨
hg export
µ¼³öchangeset£¬Ä¬Èϵ¼³ötip,ÐèÒªÓÃÖض¨ÏòÀ´µ¼³öµ½ÎļþÖÐ,Ö®ºóÕâ¸öÎļþ¿ÉÒÔͨ¹ýÓʼþ¸½¼þ·¢³ö£¬ÕâÑù¿ÉÒÔʵÏÖÎÞÍøÂçÁ¬½Ó״̬ϵİ汾ͬ²½
hg import µ¼Èëchangeset
ÎĵµºÏ²¢Èí¼þÊÇÒ»ÖÖרÃÅÓÃÓںϲ¢¸÷ÖÖÎļþµÄÈí¼þ¡£ÎĵµºÏ²¢Èí¼þ¿ÉÒÔ½«Á½¸öÎļþºÏ²¢ÎªÒ»¸öÎļþ£¬Ò²¿ÉÒÔ½«¶à¸öÎļþºÏ²¢ÎªÒ»¸öÎļþ¡£´ËÍ⣬ÕâÖÖÈí¼þ»¹¿ÉÒԺϲ¢Îı¾¡¢ÊÓƵ¡¢¸èÇú¡¢csvºÍÆäËûÀàÐ͵ÄÎļþ¡£ÓкܶàÎļþºÏ²¢Èí¼þ£¬¶àÌØϵÁС£ÎÒΪÄãÌôÑ¡ÁËһЩ¡£ÎÒÏ£ÍûÎÒÄÜÔÚÄãµÄ¹¤×÷¡¢Éú»î»òѧϰÖаïÖúÄ㣬ÕâÑùÄã¾Í¿ÉÒÔºÜÈÝÒ׵غϲ¢Äã×Ô¼ºµÄÎĵµ¡£¶àÌØÈí¼þרÌâΪÄúÌṩÎļþºÏ²¢Èí¼þ,rarºÏ²¢,tsºÏ²¢¡£¶àÌØÈí¼þÕ¾Ö»ÌṩÂÌÉ«¡¢ÎÞ¶¾¡¢ÎÞ²å¼þ¡¢ÎÞľÂíµÄ´¿ÂÌÉ«Èí¼þÏÂÔØ¡£
¶àÌØÈí¼þרÌâΪÄúÌṩpdfºÏ²¢¹¤¾ß,Ãâ·ÑpdfºÏ²¢¹¤¾ß,ÊÖ»úpdfºÏ²¢¹¤¾ß;°²×¿Æ»¹û°æÈí¼þappÒ»Ó¦¾ãÈ«¡£¶àÌØÈí¼þÕ¾Ö»ÌṩÂÌÉ«¡¢ÎÞ¶¾¡¢ÎÞ²å¼þ¡¢ÎÞľÂíµÄ´¿ÂÌÉ«¹¤¾ßÏÂÔØ
»º´æÊÓƵÎļþºÏ²¢Èí¼þ£¬»º´æÊÓƵÎļþºÏ²¢Èí¼þÊÇС±àΪ´ó¼Ò·ÖÏíµÄÒ»¿î·Ö¶ÎÊÓƵºÏ²¢Èí¼þ£¬Ö§³Ö¸÷´óÊÓƵÈí¼þ×Ô¶¯ÖÇÄÜɨÃèºÏ²¢£¬²Ù×÷¼òµ¥£¬Ê¹Ó÷½±ã£¬¶ÔÓÚ¼ÓÃÜÊÓƵ»¹ÄܽøÐÐÊÊÅä¡£ÐèÒªµÄÅóÓÑ»¶ÓÏÂÔØʹÓá£
¶àÌØÈí¼þÔ°°ïÄúÊÕ¼¯Á˹ØÓÚcadÎļþ°æ±¾×ª»»µÄÈí¼þ,ÆäÖÐѸ½ÝCAD±à¼Æ÷¡¢Ñ¸½ÝCADת»»Æ÷¡¢AutoCADÖúÊÖÔÚcadÎļþ°æ±¾×ª»»Öзdz£ºÃÓÃ.¼«´óµÄÌá¸ßÁ˹¤×÷ЧÂÊ.ÕâЩÈí¼þÎÞ¶¾,°²È«.Çë·ÅÐÄÏÂÔØ,
¶àÌØÈí¼þÔ°°ïÄúÊÕ¼¯Á˹ØÓÚcadÎļþ°æ±¾×ª»»Æ÷µÄÈí¼þ,ÆäÖÐѸ½ÝCAD±à¼Æ÷¡¢Ñ¸½ÝCADת»»Æ÷¡¢ºÆ³½CAD¿´Í¼ÍõÔÚcadÎļþ°æ±¾×ª»»Æ÷Öзdz£ºÃÓÃ.¼«´óµÄÌá¸ßÁ˹¤×÷ЧÂÊ.ÕâЩÈí¼þÎÞ¶¾,°²È«.Çë·ÅÐÄÏÂÔØ,