Re: [git-users] "copied form path" is not set when using git svn merge/dcommit

2015-07-21 Thread Konstantin Khomoutov
On Mon, 20 Jul 2015 15:16:34 -0700 (PDT) Chidveer Reddy wrote: >I have an SVN repo. > Repo > |_ branch 1 > | > |_trunk. > > 1. As an SVN user, i added a new file to "branch 1" (file1.txt) > 2. Now, i went to the git console and using git-svn, I did a fetch

Re: [git-users] "copied form path" is not set when using git svn merge/dcommit

2015-07-21 Thread Chidveer Reddy
As a work around, I'm doing merge in svn and git then, replacing the svn files with git files. But, is it hard to do something like... If a mergeinfo prop is added to a directory. For every file in that directory, before adding a file, go and check if that file was part of any revision. On Tue, J

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

2015-07-21 Thread Yenda Trmal
One of our guys figured that out -- I'm posting here his solution in case someone will deal with a similar problem https://github.com/workflow-demo-org/workflow-demo/wiki/Merge-svn-branch-from-another-Git-repo-that-Git-thinks-is-unrelated y. On Monday, July 20, 2015 at 10:16:27 AM UTC-4, Yenda T

Re: [git-users] adding a remote on a private branch.

2015-07-21 Thread Magnus Therning
On Mon, Jul 20, 2015 at 11:51:10PM -0700, dexter ietf wrote: > Hi, > > i want to add a remote for a private branch. i have a parent > repository call it (P). and two clones of P on different machines > (a) and (b), call it Pa and Pb. now in machine (a) i want to create > a private branch trackin

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

[git-users] Re: git svn workflow

2015-07-21 Thread Chidveer Reddy
Git supports multiple fetches: fetch = trunk/project-a:refs/remotes/project-a/trunk fetch = branches/demos/june-project-a-demo:refs/remotes/project-a/demos/june-demo so, change your .config file to point to your env-specific directory and a "git svn reset -r" and "fetch/rebase" On Friday, S

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] Re: Merging between multiple git svn repositories without the svn

2015-07-21 Thread John McKown
On Tue, Jul 21, 2015 at 8:58 AM, Yenda Trmal wrote: > One of our guys figured that out -- I'm posting here his solution in case > someone will deal with a similar problem > > https://github.com/workflow-demo-org/workflow-demo/wiki/Merge-svn-branch-from-another-Git-repo-that-Git-thinks-is-unrelate

[git-users] bare repo & git gc --aggressive

2015-07-21 Thread John McKown
I use git at home. I have my normal working directories. I keep the associated bare repository on a NAS box (accessed with NFS, if that matters). I am wondering if it is a good idea to periodically, say monthly, go a git gc --aggressive on the bare repositories which I update almost daily. -- Sc

Re: [git-users] Create a new repository out of "sub" repository

2015-07-21 Thread Dimitris Papageorgiou
How am I going to use git filter branch? I tried this with no effect: git filter-branch --msg-filter administrator... I got a message saying: git-rewrite already exists,please remove it Apart from the message I just do not know how to use this directive and the manual confuses me...many commands

[git-users] Could not load program git

2015-07-21 Thread RK
Hello, We are using git 1.8.3.1 on AIX 6.1 server. Recently AIX patches applied on the AIX box and git stopped working. git is failing to extract the code. Error attached . The error is mentioned below in blue color.

Re: [git-users] adding a remote on a private branch.

2015-07-21 Thread dexter ietf
Does it work even if the original cloned branch is off of (P), i'm just trying to understand how and why this can work. (Ma) is Machine A (Mb) is Machine B (P) - parent branch Ma - clone P, call it Pa - create private branch Pva in the same tree, i want to set the remote as (Pb) Mb - Clo