Changes between Version 40 and Version 41 of DevelopmentProcedure

Timestamp:

05/02/14 12:13:15 (11 years ago)

Author:

Jonathan

Comment:

—

DevelopmentProcedure

@@ -17 +17 @@
   git checkout -b ticket_353 development
 }}}
-1. Then you can setup your branch to synchronize with the central repository. This will allow you to push commits to your local branch to the central repo for others to see and/or use.
+1.  Then you can setup your branch to synchronize with the central repository.
 {{{
   git push -u origin ticket_353
 }}}
+This will allow you to push commits to your local branch to the central repo for others to see and/or use.
+
 1. You can then modify code as necessary and then use git add to add any file changes to your next commit
 {{{
@@ -29 +31 @@
   git commit -m "modified zcooling module to write ztable"
 }}}
-1. Before you push back to the main repo, you should make sure that your branch is still up to date with the latest development branch
-{{{
-  git checkout development
-  git pull
-  git checkout ticket_353
-  git merge development
-}}}
 1. And then you can push those changes to the main repo so they don't get lost
 {{{
   git push
 }}}
-1. You can repeat steps 6-9 as many times as you want until the feature is complete.  Then please notify [mailto:astrobear_dev@pas.rochester.edu] and we will merge your changes into the development branch and the next release.
+1.  You can repeat steps 6-8 as many times as you want until the feature is complete.  Then please notify [mailto:astrobear_dev@pas.rochester.edu] and we will merge your changes into the development branch and the next release.
 
 == Merging ==
@@ -68 +63 @@
 git push origin :ticket_353
 }}}
+
+
+== Working with Mercurial repositories ==
+If you have a mercurial repo - with a history that has no merges since it diverged from a revision that is in the git repo - then the process is fairly straightforward.
+
+1. First clone a copy of the official astrobear git repo and create a branch off of the revision that corresponds to the point where your commits diverged from the central hg repo
+{{{
+  git checkout -b my_new_hg_feature <git hash>
+}}}
+1. Then clone the same version of hg 
+{{{
+mv .git ../
+rm * -rf
+hg clone /path/to/hg/repo -r <hg revision number> .
+mv ../.git .
+}}}
+1. Then both hg status and git status should show that everything is up to date
+{{{
+git status -uno
+hg status -q
+}}}
+1. Then you can pull the next hg revision and then commit the changes to git
+{{{
+hg pull /path/to/hy/repo -r <hg revision number +1>
+git commit -a -m 'Commit message from hg revision'
+}}}
+1. And then repeat the following steps as needed.
+
 
 [[CollapsibleStart(Previous Procedure)]]