Changes between Version 4 and Version 5 of ChimeraWithGit

Timestamp:

Dec 2, 2010, 4:31:37 PM (15 years ago)

Author:

Darren Weber

Comment:

--

ChimeraWithGit

@@ -14 +14 @@
 cd chimera
 git status
-# Fetch the git repository for my Chimera extension; this does not merge anything.
+#
+# Step 2. Fetch the git repository for my Chimera extension.
+#
 git fetch ssh://weber.cgl.ucsf.edu/data/gitroot/chimera-extension
 # Create a temporary branch for the fetched repository, and tag its head:
@@ -20 +22 @@
 git tag -a -m "Animation last fetch" last tmp
 #
-# Step 2.  Apply initial commit from my git repository onto the git-svn
+# Step 3.  Apply the initial commit from my git repository onto the git-svn
 #
 INIT_COMMIT=$(git log tmp --pretty=format:%H | tail -1)
@@ -26 +28 @@
 git commit -C $INIT_COMMIT
 #
-# Step 3.  Rebase and submit
+# Step 4.  Rebase and submit
 #
 # Apply all the other commits to the tmp branch; make it the new master branch.
 git rebase master tmp
 git branch -M tmp master
-# Lastly, commit the changes back to the svn repository
-git svn dcommit
+#
+# Step 5.  Shuffle some files around.
+#
+mkdir libs/Animate
+git mv anim/* libs/Animate/
+rmdir anim
+
+git status
+git rm .project
+git rm .pydevproject
+git rm -r .settings
+git status
+mkdir libs/Animate/TkExamples
+git mv TkExamples/* libs/Animate/TkExamples/
+rmdir TkExamples
+git rm -r TemplateExtension
+git rm -r PyUML
+git rm -r midasExamples
+git commit -m "Reshuffle animation project files to fit into Chimera subversion repository"
+#
+# Step 6.  Lastly, commit the changes back to the svn repository.
+#
+git svn dcommit --rmdir --find-copies-harder
 }}}