task

CREATE-article# #

[previously]

  1. [2017-07-06][19:30] NEW task IN ?
    1. x] # 7377 - CREATE-article# # 
  2. [00:00] NEW article IN 
    1. ] # # - how to mercurial using tortoise hg GUI

[currently]

  1. ] Getting started with tortoiseHG https://www.youtube.com/watch?v=wqU9MFplgrQ by 
  2. ] author also has another video on dealing with merge conflicts with mercurial 
  3. ] tortoisehg is a GUI UI to the mercurial SCM software
  4. ] 

[next]

  1. ] install, 
  2. ] setup repository for project
  3. ] commit local, push remote, update remote files
  4. ] pull, merge and push
[2017-06-22] 
  1. ] get tortoiseHG at bitbucket
    1. ] installer also installs mercurial, so need for a seperate download and install
  1. ] on /SHAREd (aka remote repository) CREATE a project folder ( ex. "my-app", "trim5") 
  2. ] in the "my-app" folder, create a folder for the 'stable' build 
  3. ] use the tortoise right click menu option to make the "stable" folder a "repository"
  4. ] create the same directory structure on each user/developer machine 
    1. *] it doesnt have to be the same folder names 
  5. ] 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.
    1. [04:00][*] currently the "repo" only has .hg files which tortoise uses to mange the project, it does not yet have any project files
    2. [*] each user has ...
  6. [05:00] user (Bob), now CREATES and EDITS project files(for my-app) on his machine in his project directory (stable)
  7. ] 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
    1. [*] select file option, can ignore files that dont need to be committed to VC, ex = 
    2. [*] can use regex to pattern match on files
  8. [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  
    1. [09:00][*] other {users} need to use the hg repo explorer to PULL INCOMING CHANGES , incoming icon = arrow pointing down
    2. [*] after pull - "updates" most times, IF not the local files wont be generated, repo will be UPD 
  1. [09:45] another {user jane} makes changes to project file(s) on her system, then COMMITS locally
  2. {user Bob} makes changes to project file(s) then COMMITS locally
  3. { user Bob} pushes changes to remote repo 
  4. { user Jane} pushes to remote repo, BUT recieves CRYPTIC error message, "push creates new remote head on branch ... "
  5. [12:00] { user Jane} must PULL, MERGE, then PUSH 
  6. ] see "Bridge", 2 seperate lines of development, 
    1. ] += illustration bridge
  7. [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 
    1. ? = do we need to do this each time ( doesnt give you option after you have done it once, MAYBE synch ? ) 
Details Photos Edit more

Details

ID: 7377

NAME: CREATE-article-SCM-with-mercurial-and-tortoise

DESCRIPTION: mercurial SCM - how to - using tortoise GUI

START DATE TIME: 2017-07-06 19:25:23

EST DURATION: 01:00:00

END DATE TIME: 2017-07-06 20:25:23

STATUS: To-Do

PRIORITY: -5

OWNER ID: 1

Content Photos Edit more

photos

photos for this task

actions

Agenda Email task SMS task Priorities