edit-task

Task Description: mercurial SCM - how to - using tortoise GUI

Start Date:

Start Time:

Duration:

Priority:

Status: To Do Completed In Process

Add Photo:

Owner ID:

Content: use HTML Edit Content <h1 style="text-align: center;">CREATE-article# #</h1> <h2>[previously]</h2> <ol> <li><strong>[2017-07-06][19:30] NEW task IN ?</strong></li> <ol> <li>x] # 7377 - CREATE-article# #&nbsp;</li> </ol> <li><strong>[00:00] NEW article IN&nbsp;</strong></li> <ol> <li>] # # - how to mercurial using tortoise hg GUI</li> </ol></ol> <h2>[currently]</h2> <ol> <li>] <a href="https://www.youtube.com/watch?v=wqU9MFplgrQ" target="_blank">Getting started with tortoiseHG</a> https://www.youtube.com/watch?v=wqU9MFplgrQ by&nbsp;</li> <li>] author also has another video on dealing with merge conflicts with mercurial&nbsp;</li> <li>] tortoisehg is a GUI UI to the mercurial SCM software</li> <li>]&nbsp;</li> </ol> <h2>[next]</h2> <ol> <li>] install,&nbsp;</li> <li>] setup repository for project</li> <li>] commit local, push remote, update remote files</li> <li>] pull, merge and push</li> </ol> <div><strong>[2017-06-22]&nbsp;</strong></div> <div><ol> <li>] get tortoiseHG at bitbucket</li> <ol> <li>] installer also installs mercurial, so need for a seperate download and install</li> </ol></ol></div> <div><hr /></div> <div><ol> <li>] on /SHAREd (aka remote repository) CREATE a project folder ( ex. "my-app", "trim5")&nbsp;</li> <li>] in the "my-app" folder, create a folder for the 'stable' build&nbsp;</li> <li>] use the tortoise right click menu option to make the "stable" folder a "repository"</li> <li>] create the same directory structure on each user/developer machine&nbsp;</li> <ol> <li>*] it doesnt have to be the same folder names&nbsp;</li> </ol> <li>] now go to the USERs "stable" folder and use the RC menu to choose CLONE repository. you will be prompted for a SOURCE and DESTINATION path, the DESTINATION path should be the current "stable" folder and the SOURCE you will point to the SHAREd machines' "stable" folder/repository.</li> <ol> <li>[04:00][*] currently the "repo" only has .hg files which tortoise uses to mange the project, it does not yet have any project files</li> <li>[*] each user has ...</li> </ol> <li>[05:00] user (Bob), now CREATES and EDITS project files(for my-app) on his machine in his project directory (stable)</li> <li>] user (Bob) is now ready to COMMIT, use the right click menu and choose the "HG Commit" option, then add a "Commit Message" the describes the changes that you are committing to your local repository</li> <ol> <li>[*] select file option, can ignore files that dont need to be committed to VC, ex =&nbsp;</li> <li>[*] can use regex to pattern match on files</li> </ol> <li>[08:00] PUSH to REMOTE REPOSITORY - using rc menu, choose HG Workbench (aka repository explorer), CHECK for outgoing changes with icon = , then PUSH outgoing change set, icon = arrow point up &nbsp;</li> <ol> <li>[09:00][*] other {users} need to use the hg repo explorer to PULL INCOMING CHANGES , incoming icon = arrow pointing down</li> <li>[*] after pull - "updates" most times, IF not the local files wont be generated, repo will be UPD&nbsp;</li> </ol></ol> <div><hr /></div> <ol> <li>[09:45] another {user jane} makes changes to project file(s) on her system, then COMMITS locally</li> <li>{user Bob} makes changes to project file(s) then COMMITS locally</li> <li>{ user Bob} pushes changes to remote repo&nbsp;</li> <li>{ user Jane} pushes to remote repo, BUT recieves CRYPTIC error message, "push creates new remote head on branch ... "</li> <li>[12:00] { user Jane} must PULL, MERGE, then PUSH&nbsp;</li> <li>] see "Bridge", 2 seperate lines of development,&nbsp;</li> <ol> <li>] += illustration bridge</li> </ol> <li>[13:15] put files in remote repo - B/C no "project work" has been done on the /SHAREd repo, there are no project files that exist, just 'hg' files, USE right click menu to UPDATE and this will put project files in remote&nbsp;</li> <ol> <li>? = do we need to do this each time ( doesnt give you option after you have done it once, MAYBE synch ? )&nbsp;</li> </ol></ol></div>