CODEWITHSUNDEEP
git-svn
Emiliano
Emiliano

Reputation: 23812

Is git svn dcommit atomic?

In my company we have a subversion server and everyone is using subversion on their machines. However I'd like to use git, committing changes locally and then "push" them when I'm ready.

However, I can't understand what happens in the following situation. Let's say that I made 3 git commits locally and now I'm ready to "push" everything on the subversion server. If I understand correctly, git svn dcommit should basically make 3 commits sequentially on the server, right? But what happens if in the meantime (let's say between the second and the third commit) another colleague of mine issues a commit? The scenarios I can think of are:

1) git kind of "locks" (is that even possible?) the subversion server during commits so that my commits are doing atomically and my colleague's one is done after mine

2) The commit history on the server becomes mine1-mine2-other-mine3 (even if 'other' should fail since my colleague doesn't have an updated working copy at that point).

I think it's #2, but perhaps the committing speed is so high that this seldom becomes an issue. So which one is, #1 or #2?

Upvotes: 5

Views: 223

Answers (2)

Rutix
Rutix

Reputation: 861

If you are lucky then number 2 but most of the time you aren't that lucky. In my experience when I dcommit a lot of commits and someone else commits while doing that usually 2 things happen:

  1. It stops with dcommitting your other changes.
  2. You lose the commits not-yet dcommitted.

Number 2 is really really annoying. The main problem is that you need to be totally up-to date to use git svn dcommit. This is because git-svn doesn't let the server merge revisions on the fly. (Because it would require both committers to have a working tree with both changes).

The only way to solve this are the following steps which I found here

  1. Open .git/logs/HEAD
  2. Look for your most recent commit (note that these commits are sorted by “unix time”, although you can also find the latest one by reading the shortlog there
  3. Confirm that the commit you found is the right one: git show
  4. git reset --hard hash from log
  5. git svn rebase
  6. git svn dcommit

Following this procedure allows you to take off from where it failed. I hope they fix this soon but they said this isn't priority for them yet.

Ofcourse if you commmit small groups and have a fast connection to the server it shouldn't happen that often. (I only got it 2-3 times when actively working and committing every day for 6 months).

Upvotes: 0

Dmitry Pavlenko
Dmitry Pavlenko

Reputation: 8988

No locks are not supported in Git, it's not a Git way (Git way is branching and merginig). With git-svn you'll get mine1-mine2-other-mine3 history. If you need atomicity, have a look at SubGit project (it is installed into the SVN server and creates a pure Git interface for the SVN repository).

There was a similar question recently that might be interesting for you.

Upvotes: 5

Related Questions