Apr 28, 2011

Helpful git-svn cheatsheet

git

In my previous post “A successful git-svn workflow“, I wrote about starting out with git-svn.  This post is a followup with notes on more advanced topics.

Git SVN Branching

First Find the revision that you want to branch from:
git svn find-rev r7654

Check it out:
git checkout b0ec4f9bef566

Then actually create the branch in SVN:
git svn branch <branchName>

you should be able to see a new branch in
https://<your svn repo URL>/branches/

Cherry picking changes

Checkout the remote branch:
git checkout remotes/release-1.2.1

Create a local branch tracking with that remote:
git checkout -b release-1.2.1

Cherry pick your changes:
git cherry-pick 91721c344e3
git cherry-pick fabbed1

then commit it
git svn dcomit

Create a new Git Branch

from http://djwonk.com/blog/2009/04/18/tracking-remote-git-branches/

Push your local branch upstream:

“In my opinion, Mark Eli Kalderon’s post explains the simplest and most elegant approach. Here is his approach, slightly adapted:

  • $ git checkout -b zzz
  • # Let the hacking commence…
  • $ git push origin zzz
  • $ git checkout master # see note 2
  • $ git branch -f zzz origin/zzz
  • $ git checkout zzz
  • # Let the hacking continue…

The key to this approach is using the “-f” flag with “git branch” to force the re-creation of the local branch. It is short and easy to remember.”
Then to track an existing upstream branch:

  • $ git branch –track zzz origin/zzz

About the Author

Object Partners profile.
Leave a Reply

Your email address will not be published. Required fields are marked *

Related Blog Posts
Google Professional Machine Learning Engineer Exam 2021
Exam Description A Professional Machine Learning Engineer designs, builds, and productionizes ML models to solve business challenges using Google Cloud technologies and knowledge of proven ML models and techniques. The ML Engineer is proficient in all aspects […]
Designing Kubernetes Controllers
There has been some excellent online discussion lately around Kubernetes controllers, highlighted by an excellent Speakerdeck presentation assembled by Tim Hockin. What I’d like to do in this post is explore some of the implications […]
React Server Components
The React Team recently announced new work they are doing on React Server Components, a new way of rendering React components. The goal is to create smaller bundle sizes, speed up render time, and prevent […]
Jolt custom java transform
Jolt is a JSON to JSON transformation library where the transform is defined in JSON. It’s really good at reorganizing the json data and massaging it into the output JSON you need. Sometimes, you just […]