git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Tjernlund" <tjernlund@tjernlund.se>
To: "'Steven Grimm'" <koreth@midwinter.com>,
	"'Eric Wong'" <normalperson@yhbt.net>
Cc: "'Junio C Hamano'" <gitster@pobox.com>, <git@vger.kernel.org>
Subject: RE: [PATCH] git-svn: allow dcommit to retain local merge information
Date: Sat, 23 Jun 2007 19:56:12 +0200	[thread overview]
Message-ID: <00e001c7b5bf$ca04ed50$0e67a8c0@Jocke> (raw)
In-Reply-To: 

> > $ echo post-merge trunk change >> trunk/testfile1
> > $ svn commit -m "trunk change after merge"
> > $ echo post-merge conflicting change >> trunk/testfile2
> > $ svn commit -m "trunk change with conflict"
> > $ cd ../gitclone
> > $ git-svn fetch
> > $ git merge -m "change with conflict" trunk
> > 
> > Conflict, as expected
> > 
> > $ vi testfile2
> > $ git add testfile2
> > $ git commit
> > $ git-svn dcommit
> > Transaction is out of date: Out of date: '/trunk/testfile1' in 
> > transaction '9-1' at /Users/koreth/git/git-svn line 398
> 
> Maybe this can help?
> http://svn.haxx.se/subusers/archive-2005-02/0096.shtml
> http://subclipse.tigris.org/faq.html#out-of-date

Could this be related to do_update vs. do_switch?
Latest subversion appears to have a working
do_switch function.   


Jocke

             reply	other threads:[~2007-06-23 18:30 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-23 17:56 Tjernlund [this message]
  -- strict thread matches above, loose matches on Subject: below --
2007-06-10 23:37 git-svn set-tree bug Steven Grimm
2007-06-10 23:55 ` Joakim Tjernlund
2007-06-11  4:25   ` Eric Wong
2007-06-11  5:52     ` Junio C Hamano
2007-06-12  7:20       ` Eric Wong
2007-06-12  7:34         ` Junio C Hamano
2007-06-12  8:39           ` Eric Wong
2007-06-13  9:23             ` [PATCH] git-svn: allow dcommit to retain local merge information Eric Wong
2007-06-13 17:13               ` Joakim Tjernlund
2007-06-13 23:17                 ` Joakim Tjernlund
2007-06-20  7:04                   ` Eric Wong
2007-06-20  6:56                 ` Eric Wong
2007-06-21 16:54                   ` Joakim Tjernlund
2007-07-01 13:09                   ` Joakim Tjernlund
2007-06-14  6:30               ` Steven Grimm
2007-06-22 11:55                 ` Joakim Tjernlund

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='00e001c7b5bf$ca04ed50$0e67a8c0@Jocke' \
    --to=tjernlund@tjernlund.se \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=koreth@midwinter.com \
    --cc=normalperson@yhbt.net \
    /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).