Bug#676904: git-svn: dcommit squashed all local commits when faced with concurrent commit to svn

2012-06-10 Thread Shai Berger
Package: git-svn Version: 1:1.7.10-1 Severity: important Dear Maintainer, I was working in my git repository on a feature, and when it was done, I tried to push a series of ~10 commits to SVN by running $ git svn dcommit After several successful commits, I got the message: r6698 =

Bug#676904: git-svn: dcommit squashed all local commits when faced with concurrent commit to svn

2012-06-10 Thread Jonathan Nieder
retitle 676904 git svn dcommit: copes poorly with concurrent overlapping svn commit tags 676904 + upstream quit Hi Shai, Shai Berger wrote: $ git svn dcommit After several successful commits, I got the message: r6698 = d0fd92e1ee64d235aac15e027c07441ca800d939 (refs/remotes/git-svn) W:

Bug#676904: git-svn: dcommit squashed all local commits when faced with concurrent commit to svn

2012-06-10 Thread Shai Berger
retitle 676904 git svn dcommit: copes poorly with concurrent svn commit thanks Hi Jonathan, On Sunday 10 June 2012, Jonathan Nieder wrote: Shai Berger wrote: It seems I had no choice left but to commit the changes as one, and then dcommit. git log -g can be useful for finding the old