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

2015-07-20 Thread dexter ietf
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 tracking Pb, how do i go about achieving this, any help is appreciated.. thank

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

2015-07-20 Thread Chidveer Reddy
Team, 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 and merge to trunk (from branch 1 to trunk). Merge went well and i

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] creating a new branch

2015-07-20 Thread Nelson Efrain A. Cruz
what I was trying to say is: your repo contains the files inside administrator folder, so you can make a new folder called administrator inside your repo and move all the files in the repo inside that folder. Then the folder that contains your repo can be renamed to appointments and moved one level

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] Create a new repository out of "sub" repository

2015-07-20 Thread Konstantin Khomoutov
On Mon, 20 Jul 2015 06:50:02 -0700 (PDT) Dimitris Papageorgiou wrote: > I have git init a working directory...here is > it C:\Apache24\htdocs\Appointments\Administrator > > I now want to create git init another directory which sits *above > *the aforementionedC:\Apache24\htdocs\Appointments

Re: [git-users] git5 export results in AssertionError: -11

2015-07-20 Thread Konstantin Khomoutov
On Mon, 20 Jul 2015 10:43:14 -0700 (PDT) Thomas de Rivaz wrote: > Recently (in last hour) started getting this. Anyone have any insight? We here deal with plain Git, and git5 is some internal Google tool. So please reach for your nearby Git goto guy. -- You received this message because you ar

[git-users] git5 export results in AssertionError: -11

2015-07-20 Thread Thomas de Rivaz
Recently (in last hour) started getting this. Anyone have any insight? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups

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

Re: [git-users] creating a new branch

2015-07-20 Thread Philip Oakley
Why not try: git bundle --all MyRepo.bundle which will create a single file which has "zipped/Tar'd" the repo in git format, and you can then delete the old repo and re-import/clone from the bundle. The bundle knows nothing of the higher level directory structure, only the structure of the p

Re: [git-users] creating a new branch

2015-07-20 Thread Dimitris Papageorgiou
Why move the repo one folder up... It is already there...at C:\Apache24\htdocs\Appointments\Administrator\ I do not quite understand...but more importantly...*changing the dir structure of my web project it is something I want to avoid..*.. Τη Δευτέρα, 20 Ιουλίου 2015 - 6:17:52 μ.μ. UTC+3, ο χρ

Re: [git-users] creating a new branch

2015-07-20 Thread Nelson Efrain A. Cruz
Assuming that those are the only folders (and files), one solution could be: move all your files (git mv) inside a folder called "Administrator" (like C:\Apache24\htdocs\ Appointments\Administrator\Administrator) and then move the repo one folder up. I think this will be the easiest solution, of

[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

[git-users] creating a new branch

2015-07-20 Thread Dimitris Papageorgiou
I have git init a working directory...here is it C:\Apache24\htdocs\Appointments\Administrator I now want to create git init another directory which sits *above *the aforementionedC:\Apache24\htdocs\Appointments Soin essenceI want to disregard/delete the old branch/repo(C:\Apache24