# Hello all, I am using git-svn and have some question 5 messages from 2007-01-06 to 2007-01-07. Participants: Songmao Tian, Eric Wong. Thread: https://gitlist.dev/t/6242 ## Songmao Tian, 2007-01-06 09:24 Subject: Hello all, I am using git-svn and have some question Message-ID: <7d73e7d80701060124t16850e8ob8fbd202d230dd90@mail.gmail.com> URL: https://gitlist.dev/e/7d73e7d80701060124t16850e8ob8fbd202d230dd90%40mail.gmail.com ``` (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) 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(-) 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 ``` ## Eric Wong, 2007-01-07 00:23 Subject: Re: Hello all, I am using git-svn and have some question Message-ID: <20070107002317.GC10933@localdomain> URL: https://gitlist.dev/e/20070107002317.GC10933%40localdomain In-Reply-To: <7d73e7d80701060124t16850e8ob8fbd202d230dd90@mail.gmail.com> ``` 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 ``` ## Songmao Tian, 2007-01-07 06:06 Subject: Re: Hello all, I am using git-svn and have some question Message-ID: <7d73e7d80701062206y34db9d06k3c871c7e83a8aa4@mail.gmail.com> URL: https://gitlist.dev/e/7d73e7d80701062206y34db9d06k3c871c7e83a8aa4%40mail.gmail.com In-Reply-To: <20070107002317.GC10933@localdomain> ``` 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 > ``` ## Eric Wong, 2007-01-07 06:31 Subject: Re: Hello all, I am using git-svn and have some question Message-ID: <20070107063101.GA23429@mayonaise.dyndns.org> URL: https://gitlist.dev/e/20070107063101.GA23429%40mayonaise.dyndns.org In-Reply-To: <7d73e7d80701062206y34db9d06k3c871c7e83a8aa4@mail.gmail.com> ``` Songmao Tian wrote: > 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 I don't see anything regarding multi-fetch changed between v1.4.4.1..v1.4.4.3. Did you forget the --follow-parent flag? No worries though, you can use 'git-svn graft-branches' to connect a branch to its parent; and if that doesn't work automatically; you can edit the .git/info/grafts file with parent info (it's documented in Documentation/repository-layout.txt. -- Eric Wong ``` ## Songmao Tian, 2007-01-07 08:12 Subject: Re: Hello all, I am using git-svn and have some question Message-ID: <7d73e7d80701070012y5f15cde4gf2d9a36fab1815ae@mail.gmail.com> URL: https://gitlist.dev/e/7d73e7d80701070012y5f15cde4gf2d9a36fab1815ae%40mail.gmail.com In-Reply-To: <20070107063101.GA23429@mayonaise.dyndns.org> ``` exactly~, thx again On 1/7/07, Eric Wong wrote: > Songmao Tian wrote: > > 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 > > I don't see anything regarding multi-fetch changed between > v1.4.4.1..v1.4.4.3. Did you forget the --follow-parent flag? > No worries though, you can use 'git-svn graft-branches' to > connect a branch to its parent; and if that doesn't work automatically; > you can edit the .git/info/grafts file with parent info (it's > documented in Documentation/repository-layout.txt. > > -- > Eric Wong > ```