From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 09 Nov 2006 19:22:00 GMT
Subject: Re: [PATCH] git-svn: fix dcommit losing changes when out-of-date from svn
Message-ID: <20061109192200.GA3604@localdomain>
In-Reply-To: <m2r6wcy0t0.fsf@ziti.local>

Seth Falcon <sethfalcon@gmail.com> wrote:
> 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 :-)

Yes, this is as safe as a regular svn commit from a working copy.
Transactions will abort if there are conflicts in the files being
committed.

--