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.

Related Blog Posts
Android Development for iOS Developers
Android development has greatly improved since the early days. Maybe you tried it out when Android development was done in Eclipse, emulators were slow and buggy, and Java was the required language. Things have changed […]
Add a custom object to your Liquibase diff
Adding a custom object to your liquibase diff is a pretty simple two step process. Create an implementation of DatabaseObject Create an implementation of SnapshotGenerator In my case I wanted to add tracking of Stored […]
Keeping Secrets Out of Terraform State
There are many instances where you will want to create resources via Terraform with secrets that you just don’t want anyone to see. These could be IAM credentials, certificates, RDS DB credentials, etc. One problem […]
Validating Terraform Plans using Open Policy Agent
When developing infrastructure as code using terraform, it can be difficult to test and validate changes without executing the code against a real environment. The feedback loop between writing a line of code and understanding […]