Re: [git-users] Merging between multiple git svn repositories without the svn

2015-07-27 Thread Magnus Therning
On 21 Jul 2015 5:11 pm, "Jan Trmal" wrote: > > Magnus, I agree with your arguments. But yet, we are/were in the situation when we have to have some strategy how to deal with it. Indeed! I'm sorry if I came across as if I was arguing with you. I hope the blog post linked to in another response can

Re: [git-users] Merging between multiple git svn repositories without the svn

2015-07-21 Thread Jan Trmal
Magnus, I agree with your arguments. But yet, we are/were in the situation when we have to have some strategy how to deal with it. y. On Tue, Jul 21, 2015 at 11:01 AM, Magnus Therning wrote: > On Mon, Jul 20, 2015 at 02:45:36PM -0400, Jan Trmal wrote: > > John, thanks for your response, I will e

Re: [git-users] Merging between multiple git svn repositories without the svn

2015-07-21 Thread Magnus Therning
On Mon, Jul 20, 2015 at 02:45:36PM -0400, Jan Trmal wrote: > John, thanks for your response, I will experiment with your suggestions. > Let me clarify details of what I was saying-- I'm not sure if I'm able to > express my concern clearly. > > Both of these repositories ("jtrmal", "vimal") were cr

Re: [git-users] Merging between multiple git svn repositories without the svn

2015-07-20 Thread Paul Smith
On Mon, 2015-07-20 at 14:47 -0500, John McKown wrote: > ​I am not a git internals person. But I think you may have a > misunderstanding. git doesn't use a "dependency graph" to do > merges. ... The second is a "non fast forward" merge (SHA-1 commit > value is not in the list of commits in the remot

Re: [git-users] Merging between multiple git svn repositories without the svn

2015-07-20 Thread John McKown
On Mon, Jul 20, 2015 at 1:45 PM, Jan Trmal wrote: > John, thanks for your response, I will experiment with your suggestions. > Let me clarify details of what I was saying-- I'm not sure if I'm able to > express my concern clearly. > > Both of these repositories ("jtrmal", "vimal") were created fr

Re: [git-users] Merging between multiple git svn repositories without the svn

2015-07-20 Thread Jan Trmal
John, thanks for your response, I will experiment with your suggestions. Let me clarify details of what I was saying-- I'm not sure if I'm able to express my concern clearly. Both of these repositories ("jtrmal", "vimal") were created from the same svn repository, using git svn clone. The master b

Re: [git-users] Merging between multiple git svn repositories without the svn

2015-07-20 Thread John McKown
On Mon, Jul 20, 2015 at 9:16 AM, Yenda Trmal wrote: > Guys, > this might be a trivial or already answered question, but I'm not able to > find anything on the subject (perhaps I'm not sure what to ask about in the > git terminology). > As a background -- we are planning to migrate Kaldi from the

[git-users] Merging between multiple git svn repositories without the svn

2015-07-20 Thread Yenda Trmal
Guys, this might be a trivial or already answered question, but I'm not able to find anything on the subject (perhaps I'm not sure what to ask about in the git terminology). As a background -- we are planning to migrate Kaldi from the sf.net svn repository to github. There are already Kaldi r