From: David Watson <dwatson@mimvista•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: Eric Wong <normalperson@yhbt•net>, git@vger•kernel.org
Subject: Re: git svn dcommit not checking if up-to-date?
Date: Fri, 31 Aug 2007 19:48:55 -0400 [thread overview]
Message-ID: <20070831234854.GA6451@mimvista.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0709010017250.28586@racer.site>
I just reproduced this one in a live repository. Here's what you do:
$ git checkout -b breakme trunk
$ vi file1.txt
$ git-commit -a -m 'first change'
$ vi file2.txt
$ git-commit -a -m 'second change'
..... Full moon, become a werewolf ......
C:\svnrepo> edit file2.txt
C:\svnrepo> svn commit -m 'this will be gone'
..... Become yourself again ....
$ git svn fetch --all # (not sure if this is necessary)
$ git svn dcommit
$ git log -p
The change to file2 by your hairier, fanged self will be gone.
The critical thing is that you must dcommit *multiple* commits, and the
first one can't be the conflicting file, otherwise it will stop. At the
time the first commit of the dcommit has gone through, git-svn now thinks
it's all up-to-date.
On Sat, Sep 01, 2007 at 12:17:33AM +0100, Johannes Schindelin wrote:
> Hi,
>
> On Fri, 31 Aug 2007, Eric Wong wrote:
>
> > Johannes Schindelin <Johannes.Schindelin@gmx•de> wrote:
> > >
> > > harningt just asked about known issues of git-svn on IRC, and I
> > > remembered that I had an issue: Accidentally, I forgot to "git svn
> > > fetch" before "git svn dcommit"ing, and unfortunately, a colleague had
> > > just checked in a change, which got undone by my dcommit.
> >
> > I believe this was fixed a while back in commit
> > 45bf473a7bc2c40c8aea3d34a0eab7a41e77a8ff
> > (Thu Nov 9 01:19:37 2006 -0800).
>
> That is strange, since I had this issue in July or August (this year).
> And I am quite certain that I ran with pretty up-to-date git (I usually
> track "next" quite closely).
>
> Ciao,
> Dscho
>
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger•kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Dave Watson
Software Engineer
MIMvista Corp
next prev parent reply other threads:[~2007-08-31 23:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-31 21:04 git svn dcommit not checking if up-to-date? Johannes Schindelin
2007-08-31 21:46 ` David Watson
2007-08-31 22:18 ` Eric Wong
2007-08-31 23:17 ` Johannes Schindelin
2007-08-31 23:48 ` David Watson [this message]
2007-09-01 0:25 ` [PATCH] Test for git-svn dcommit clobbering changes David Watson
2007-09-01 1:16 ` [PATCH] git-svn: fix dcommit clobbering upstream when committing multiple changes Eric Wong
2007-09-01 1:32 ` Johannes Schindelin
2007-09-01 5:43 ` Karl Hasselström
2007-09-01 9:33 ` Eric Wong
2007-09-01 10:24 ` Karl Hasselström
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=20070831234854.GA6451@mimvista.com \
--to=dwatson@mimvista$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=normalperson@yhbt$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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