mecurial hg

Download Mecurial hg

If you can't read please download the document

Upload: iaiyang

Post on 31-May-2015

1.751 views

Category:

Documents


3 download

DESCRIPTION

Mercurial 版本管理简单介绍。

TRANSCRIPT

  • 1. Mercurial By

2.

3. 4. 5. 6. 7. CVS, SVN 8.

9. 10. 11. 12. GitMercurialbzr 13. 14. Mercurial Hg

  • Mercurial linux

15. Mercurial 16. Python.orgMozillaOpenOffice 17. 18. bitbucketgoogle codesourceForge 19. Linux/Mac/Win 20. GUI Linux hgk, Win TortiseHG 21. Subversion1 Mercurial

22. 23. 24. Merge 25. checkout Subversion

26. 27. 28. merge 29. 30. Mercurial Subversion2 Mercruial

31. pullpush 32. 33. 34. DVSgithg Subversion

35. 36. 37. 38. SubversionCVS 39. Mercurial Git Mercurial

40. httphttp 41. 42. Git

  • hash

43. 150 44. http 45. windows 46. 47. Mercurial

48. hg init 49. 50. hg add [FILE ] 51. 52. hg remove [FILE ] 53. 54. hg rename OLD NEW

55. hg status [FILE...] 56. 57. hg diff [FILE...] 58. 59. hg log 60. hg glog 61.

62. hg commit [FILE ] 63. 64. hg revert [FILE ] 65. 66. hg rollback [FILE ] 67. Branch

68. hg branch BRANCH_NAME 69. 70. hg update -r BRANCH_NAME 71. default 72. 73. hg branches 74.

75. hg tag TAG_NAME 76. 77. hg update -r TAG_NAME 78. 79. hg tags 80. .hgtags 81. 'tip' 82.

83. hg serve 84. 85. hg clone EXISTS_REPO project 86. EXISTS_REPO 87. http[s]://server/project 88. svn://server/path/to/project 89. [ file://]/path/to/project 90. 91. hg push REMOTE 92. 93. hg pull REMOTE 94. 95. hg checkout 96. Mericurial 97.

  • Direct acylic graph

98. 99. " " 100. 101. Merge 102. 103. Merge 104. Merge 105. hg pullhead6:d2b5 106. 107.

108. vimdiff, kdiff3, 109. .hgrc 110. merge = vimdiff 111.

112. 113.

114. pullpushoriginpush-pullpull changes 115. main

116. master 117. develop 118. origin/master 119. origin/develop 120. develop master 121. Supporting

122. 123. 124. Feature branches 125. Release branches 126. Hotfix branches 127. Feature branches

  • : develop

128. develop 129. master,develop,release-,hotfix- 130. Feature branches()develop 131. Release branch

  • : develop

132. develop master 133. release-* 134. Release branch production release(RC)bug() Release branchdevelop branch 135. developrelease:developreleaserelease 136. Hotfix branch

  • : master

137. develop master 138. hotfix-* 139. Hotfix branchRelease branchproduction releasebugHotfix branchmasterbug 140.

  • Questions ?