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: 324dfba2492b5862db452dc062f8f0461a3b6d22 and refs/remotes/git-svn differ, > using rebase: > :040000 040000 62a1df591aa5be8f65385f079e88a8bb8158cd99 > c355c087fc649e15c849afb671d570f9cc227fb7 M one-of-my-folders > Cannot rebase: You have unstaged changes. I see. [...] > 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 history to return to, and then you can use "git svn rebase" and try again. But I agree that this is less friendly than it should be. Sorry for the trouble and hope that helps, Jonathan -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
