From: Seth Falcon <sethfalcon@gmail.com>
Date: Thu, 09 Nov 2006 17:42:03 GMT
Subject: Re: [PATCH] git-svn: fix dcommit losing changes when out-of-date from svn
Message-ID: <m2r6wcy0t0.fsf@ziti.local>
In-Reply-To: <7vfyctkki5.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> writes:
> Eric Wong <normalperson@yhbt.net> writes:
>
>> There was a bug in dcommit (and commit-diff) which caused deltas
>> to be generated against the latest version of the changed file
>> in a repository, and not the revision we are diffing (the tree)
>> against locally.
>>
>> This bug can cause recent changes to the svn repository to be
>> silently clobbered by git-svn if our repository is out-of-date.

Eric, with this patch, is a dcommit operation as safe as a regular svn
commit from an svn working copy?  That is, the commit will abort if
the svn repository has changes that your git-svn/git repo hasn't yet
seen?  I'm pretty sure the answer is yes, but I'd like to be sure :-)

> Steven, I do not interact with real svn repository myself so I
> can only judge from the test in this patch and Steven's test
> case, so it would be more assuring for me if you can confirm it
> fixes the issue for you.

I'm not Steven, but I was reproducing the bug and with Eric's patch, I
get a nice error/abort when I try to dcommit when the svn repos has
relevant changes that I have not fetched yet.

Best,