From: Eric Wong <normalperson@yhbt.net>
To: Seth Falcon <sethfalcon@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-svn: fix dcommit losing changes when out-of-date from svn
Date: Thu, 9 Nov 2006 11:22:00 -0800 [thread overview]
Message-ID: <20061109192200.GA3604@localdomain> (raw)
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.
--
next prev parent reply other threads:[~2006-11-09 19:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-09 0:34 git-svn can lose changes silently Steven Grimm
2006-11-09 7:33 ` Seth Falcon
2006-11-09 9:19 ` [PATCH] git-svn: fix dcommit losing changes when out-of-date from svn Eric Wong
2006-11-09 10:00 ` Junio C Hamano
2006-11-09 17:42 ` Seth Falcon
2006-11-09 19:22 ` Eric Wong [this message]
2006-11-09 19:30 ` Steven Grimm
2006-11-09 20:47 ` Eric Wong
2006-11-09 22:37 ` Steven Grimm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061109192200.GA3604@localdomain \
--to=normalperson@yhbt.net \
--cc=git@vger.kernel.org \
--cc=sethfalcon@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).