From: Eric Wong <normalperson@yhbt.net>
Date: Sun, 07 Jan 2007 00:23:17 GMT
Subject: Re: Hello all, I am using git-svn and have some question
Message-ID: <20070107002317.GC10933@localdomain>
In-Reply-To: <7d73e7d80701060124t16850e8ob8fbd202d230dd90@mail.gmail.com>

Songmao Tian <kingkongmao@gmail.com> wrote:
> (git v1.4.4.3)
> I used the fantastic git-svn multi-init.
> git-svn multi-init http://...
> 
> checkout a branch
> git-checkout -b kkmao remotes/kkmao
> git-checkout -b huahua remotes/huahua
> 
> git-pull . kkmao
> (fix a conflict)

I no longer recommend using plain git-pull or git-merge with git-svn,
especially when using dcommit (which I highly recommend).

git-rebase or git-rebase --merge is the recommended method of merging
upstream changes.  Using the --squash flag with git-pull or git-merge
should also work here, but I have less experience with them.

> git-checkout kkmao
> 
> kkmao@Loongson:~/pmon/pmon-lm2e/git$ git-pull . huahua
> Updating dee0161..3fa715b
> Fast forward
> Targets/Bonito/conf/Bonito |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

On the other hand, pulls/merges without --squash resulting in fast
forwards are fine (but git-rebase handles fast forwards just as well).

> finnally, "git-svn dcommit -i kkmao"failed, and got the following message
> 
> kkmao@Loongson:~/pmon/pmon-lm2e/git$ git-svn dcommit -i kkmao
> diff-tree f179060aa2dd0a4ca4f95f2560ea708765a87a09~1
> f179060aa2dd0a4ca4f95f2560ea708765a87a09
> Merge conflict during commit: Your file or directory 'branches' is
> probably out-of-date: The version resource does not correspond to the
> resource within the transaction.  Either the requested version
> resource is out of date (needs to be updated), or the requested
> version resource is newer than the transaction root (restart the
> commit). at /home/kkmao/bin/git-svn line 1577

This seems to be most likely because dcommit skips merge commits
(generated by your pull).

-- 
Eric Wong