From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Songmao Tian" Subject: Re: Hello all, I am using git-svn and have some question Date: Sun, 7 Jan 2007 14:06:44 +0800 Message-ID: <7d73e7d80701062206y34db9d06k3c871c7e83a8aa4@mail.gmail.com> References: <7d73e7d80701060124t16850e8ob8fbd202d230dd90@mail.gmail.com> <20070107002317.GC10933@localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jan 07 07:06:51 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1H3RBC-00087j-Is for gcvg-git@gmane.org; Sun, 07 Jan 2007 07:06:50 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932415AbXAGGGr (ORCPT ); Sun, 7 Jan 2007 01:06:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932416AbXAGGGq (ORCPT ); Sun, 7 Jan 2007 01:06:46 -0500 Received: from nf-out-0910.google.com ([64.233.182.189]:59257 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932415AbXAGGGp (ORCPT ); Sun, 7 Jan 2007 01:06:45 -0500 Received: by nf-out-0910.google.com with SMTP id o25so9023253nfa for ; Sat, 06 Jan 2007 22:06:44 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=r8PNrWMDEdgq2S+9tXyMAh+eW+v3OT3YawC/rLTybccZgkauOzRVXvi49uTpILD7H2/SoSPFVrxoB+TH5DG8CIefwUa6GpFlLrJG0UPJGDBYH9MuwqNoei6G1ekE91PMc8jpNvuMFPyNnhLTgncQRnwj6xIp91hEFzG2nOswL7U= Received: by 10.49.64.18 with SMTP id r18mr24223036nfk.1168150004702; Sat, 06 Jan 2007 22:06:44 -0800 (PST) Received: by 10.48.212.10 with HTTP; Sat, 6 Jan 2007 22:06:44 -0800 (PST) To: "Eric Wong" In-Reply-To: <20070107002317.GC10933@localdomain> Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: I have made a mistake, while use 1.4.4.1, exec git-svn multi-fetch will find possible parent for each branch, but 1.4.4.3 will not. with parent found, git-rebase between branches will result in less conflict. I wonder if I have made another mistake while using 1.4.4.3:), for i like the way 1.4.4.1's multi-fetch did On 1/7/07, Eric Wong wrote: > Songmao Tian 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 >