[git-users] .gitattributes merge=ours doesn't work on msysgit?
I've just learned about merge=ours in .gitattributes from the Pro Git bookhttp://www.git-scm.com/book/en/Customizing-Git-Git-Attributes. I have a file that I always want to resolve by keep ours. So I created a .gitattributes file in the directory where the file is found with this content: version.txt merge=ours And checked in this file. Then I merged another branch into this one and the file conflict still showed up. I'm using git version 1.7.11.msysgit.1 Am I misusing this feature, or is it just not supported in this version? Thanks. -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] GiT + Software revision + Branching
Hello, I want to migrate a lot of project from CVS to GiT. I found cvs2git, which is working fine, but I'm confused about a few things... We are currently using CVS in a strange, but historic way. Let's take an specific example : I have a project called x. In my CVS repository, each file is tagged for each software revision, the file x/myfile.xml got 3 tags for 3 revisions. 1.0.0.0R : 1.1 2.0.0.0R : 1.2 3.0.0.0R : 1.3 Like this, we are able to work on V1.0.0.0 as V2.0.0.0 as V3.0.0.0. We just need to extract all files from this project corresponding to the wanted revision. This is all about working on new feature, debugging and maintenance. To compile, we have a server which checkout file for each revision. We want to take advantages of GiT, and implements devlopment, integration and production branch. I've read a lot of articles speaking about GiT, branching, tagging... but I can't find a real solution for that type of GiT workflow... Is it possible to have theses 3 branches, and a sub branch for each package revision? Do I need to use tags? With them I can't imagine to maintain like... 10 revisions of a project... What is exactly submodules? Can I use them for my workflow? Thank you for helping, Jacques -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] will i have to initialize other folders/directories which are in my master repository ?
Hi all, Few days back i started to learn about git , so* i m very beginner for git and i never used any kind of version control before it * what exactly i want to do is that - *want to use git for tracking my project local* (offline) for this i made my main folder/directory called *project *and by using *$git init , * i initialized it as a git repository now in *project directory * i made 3 sub directories or folder called - design - css - images will i have to initialize other folders/directories which are in my master repository ? any suggestion also for *tracking my project local* (offline) will be helpful for me Thanks Jamna -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] will i have to initialize other folders/directories which are in my master repository ?
Hello, You only have to initialize your project root, and add files in them with git add css/main.css Best, Gergely On 5 February 2013 14:34, Jamna Vyas vyas.ja...@gmail.com wrote: Hi all, Few days back i started to learn about git , so* i m very beginner for git and i never used any kind of version control before it * what exactly i want to do is that - *want to use git for tracking my project local* (offline) for this i made my main folder/directory called *project *and by using *$git init , * i initialized it as a git repository now in * project directory * i made 3 sub directories or folder called - design - css - images will i have to initialize other folders/directories which are in my master repository ? any suggestion also for *tracking my project local* (offline) will be helpful for me Thanks Jamna -- 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.com. For more options, visit https://groups.google.com/groups/opt_out. -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] will i have to initialize other folders/directories which are in my master repository ?
Thanks :) -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] GiT + Software revision + Branching
On Tue, 5 Feb 2013 04:33:25 -0800 (PST) Jacques Knipper jacques.knip...@gmail.com wrote: I want to migrate a lot of project from CVS to GiT. It's called Git or git, not GiT. I found cvs2git, which is working fine, but I'm confused about a few things... We are currently using CVS in a strange, but historic way. Let's take an specific example : I have a project called x. In my CVS repository, each file is tagged for each software revision, the file x/myfile.xml got 3 tags for 3 revisions. 1.0.0.0R : 1.1 2.0.0.0R : 1.2 3.0.0.0R : 1.3 Like this, we are able to work on V1.0.0.0 as V2.0.0.0 as V3.0.0.0. We just need to extract all files from this project corresponding to the wanted revision. This is all about working on new feature, debugging and maintenance. To compile, we have a server which checkout file for each revision. We want to take advantages of GiT, and implements devlopment, integration and production branch. I've read a lot of articles speaking about GiT, branching, tagging... but I can't find a real solution for that type of GiT workflow... Well, it seems that you just doesn't *feel* how your workflow should map to Git as you have no experience with Git yet. If I understood your use case correctly, you have nothing which would be somehow special to Git -- see below. Is it possible to have theses 3 branches, and a sub branch for each package revision? Using branches is just the only way you do this in Git as Git is about branching ;-) The basic idea is that your code base evloves and at some point you decide that its current state is mature enough to eventually produce a new release after certain polishing and bug squashing. Normally you fork a new branch at this point and name it something like release-1.1. You then can continue developing on the mainline branch and do only bugfix commits on the release-1.1 branch (which can be backported back to the mainline branch using `git cherry-pick`). You can have any number of such release-X.Y branches in parallel, of course. A classical essay on this approach is [1]. It contains nice pictures so consider reading it. Note that it's not the only possible workflow, and at least you might adjust certain details if you decide to adopt it. Do I need to use tags? With them I can't imagine to maintain like... 10 revisions of a project... No, tags are (supposed to be) immovable and are used to mark certain milestones. Say, when you finally decide to cut a release out of the tip of your release-1.1 branch, you might tag it as v1.1. What is exactly submodules? Can I use them for my workflow? Submodules provide a way yo have several external Git repositories being checked out along with your main repository, which is useful if your project depends on other (external) projects. Apparently, this feature has nothing to do with your workflow. 1. http://nvie.com/posts/a-successful-git-branching-model/ -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] GiT + Software revision + Branching
I want to migrate a lot of project from CVS to GiT. It's called Git or git, not GiT. I beg your pardon :) I found cvs2git, which is working fine, but I'm confused about a few things... We are currently using CVS in a strange, but historic way. Let's take an specific example : I have a project called x. In my CVS repository, each file is tagged for each software revision, the file x/myfile.xml got 3 tags for 3 revisions. 1.0.0.0R : 1.1 2.0.0.0R : 1.2 3.0.0.0R : 1.3 Like this, we are able to work on V1.0.0.0 as V2.0.0.0 as V3.0.0.0. We just need to extract all files from this project corresponding to the wanted revision. This is all about working on new feature, debugging and maintenance. To compile, we have a server which checkout file for each revision. We want to take advantages of GiT, and implements devlopment, integration and production branch. I've read a lot of articles speaking about GiT, branching, tagging... but I can't find a real solution for that type of GiT workflow... Well, it seems that you just doesn't *feel* how your workflow should map to Git as you have no experience with Git yet. If I understood your use case correctly, you have nothing which would be somehow special to Git -- see below. Is it possible to have theses 3 branches, and a sub branch for each package revision? Using branches is just the only way you do this in Git as Git is about branching ;-) The basic idea is that your code base evloves and at some point you decide that its current state is mature enough to eventually produce a new release after certain polishing and bug squashing. Normally you fork a new branch at this point and name it something like release-1.1. You then can continue developing on the mainline branch and do only bugfix commits on the release-1.1 branch (which can be backported back to the mainline branch using `git cherry-pick`). You can have any number of such release-X.Y branches in parallel, of course. A classical essay on this approach is [1]. It contains nice pictures so consider reading it. Note that it's not the only possible workflow, and at least you might adjust certain details if you decide to adopt it. OK, I understand, a way to use git in my case is to use branching for software release. But how to set branch for development, integration and production in parallels of releases branch? I abviously need to be able to work on any release of any packages at any time. Maybe you have already answered to me, and I apologize if it's the case, but I need some lights on it I guess :) Do I need to use tags? With them I can't imagine to maintain like... 10 revisions of a project... No, tags are (supposed to be) immovable and are used to mark certain milestones. Say, when you finally decide to cut a release out of the tip of your release-1.1 branch, you might tag it as v1.1. What is exactly submodules? Can I use them for my workflow? Submodules provide a way yo have several external Git repositories being checked out along with your main repository, which is useful if your project depends on other (external) projects. Apparently, this feature has nothing to do with your workflow. Ok, I got it :) 1. http://nvie.com/posts/a-successful-git-branching-model/ I know this very helpful link. Thank you very much for your help. You said you have nothing which would be somehow special to Git What do you mean exactly? Do you have some others helpful tips for this kind of workflow? Again, thank you :) -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] which version of GIT should I use
I'm new to git and have some questions about setting up and maintaining GIT. Not sure if this is the correct forum, and my apologies in advance. I am trying to understand where the information is stored regarding what version of GIT is the correct version to use for the systems we use in our work environment. The systems will be RHat 5.5 or/and Rhat 5.7 and Windows XP, Windows 2008 Server and Windows 7. When I go to the GIT Download, I do not see a version specific to all these environments and in some cases (windows) it just started to down load the .exe without any additional info. Maybe it's that simple and i am concerned about nothing. your assistance is greatly appreciated. TPM -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] putty ssh into ubunut 12.04 server vbox guest have git install window
I use putty to log in to my vbox ubuntu to do things. but when i install git, putty will not show its gui where i put ip address and port. I have readied i can just use git to do it too. I use git to pull down things from github to my window. I can not use putty to ssh into ubuntu vbox host. If someone can help me to set it up or how to still use putty with git install. putty to log into ubuntu git to pull down things from github into windows vbox has my ubuntu 12.04 is guest on my window 7 64 yes my ubuntu 12.04 guest has openssh on it. can someone link where or tell me how to make this work again or how to make git do it for me with out going though 20 miles of things to get it working. -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] which version of GIT should I use
On Tue, 5 Feb 2013 07:51:34 -0800 (PST) tpm t.mazze...@gmail.com wrote: [...] I am trying to understand where the information is stored regarding what version of GIT is the correct version to use for the systems we use in our work environment. I don't understand this question because you don't specify what is the criteria for correctness. The systems will be RHat 5.5 or/and Rhat 5.7 and Windows XP, Windows 2008 Server and Windows 7. When I go to the GIT Download, I do not see a version specific to all these environments and in some cases (windows) it just started to down load the .exe without any additional info. Downloadable version of Git for Windows installer contains the latest stable preview [*] release. It usually lags about a week to month behind the matching upstream source release. Maybe it's that simple and i am concerned about nothing. As I've said, I do not really understand the question. If you're concerned about the fact your varied OSes have different stock versions of Git, which might have interoperability issues, then your concerns are unfounded. Git has well-defined on-disk format of its database (what comprises the Git repository) which has been established pretty long time ago, and new features being introduced are kept compliant with the format. The same applies to Git wire protocols (those Git client and server use for communicating). Hence I'd say you should not have problems accessing the same repositories using versions of Git in the range 1.6-1.8 at least. [*] There's no official Git for Windows release. Its developers deliberately underline the experimental character of this port, and since the development team is severely undermanned and receives precisely zero commercial support (several hundreds downloads per day notwithstanding) the situation has no signs of changing in the near future. On the other hand, Git for Windows appears to be rock solid in a day-to-day experience for many people. -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] putty ssh into ubunut 12.04 server vbox guest have git install window
On Tue, 5 Feb 2013 08:41:12 -0800 (PST) Lewis Hill lewishil...@gmail.com wrote: I use putty to log in to my vbox ubuntu to do things. but when i install git, putty will not show its gui where i put ip address and port. I fail to parse it. Do you mean that after installing Git PuTTY seases to work completely, like you attempt to run it, and it won't show up? Or what? Or do you mean you expect PuTTY to be installed by Git for Windows installer? [...] -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: putty ssh into ubunut 12.04 server vbox guest have git install window
when i click on putty on desktop it show up and then go a way but if i look in task manger i can see it there but no ui where i put ip and port or where i can save or load one On Tuesday, February 5, 2013 11:41:12 AM UTC-5, Lewis Hill wrote: I use putty to log in to my vbox ubuntu to do things. but when i install git, putty will not show its gui where i put ip address and port. I have readied i can just use git to do it too. I use git to pull down things from github to my window. I can not use putty to ssh into ubuntu vbox host. If someone can help me to set it up or how to still use putty with git install. putty to log into ubuntu git to pull down things from github into windows vbox has my ubuntu 12.04 is guest on my window 7 64 yes my ubuntu 12.04 guest has openssh on it. can someone link where or tell me how to make this work again or how to make git do it for me with out going though 20 miles of things to get it working. -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Re: putty ssh into ubunut 12.04 server vbox guest have git install window
On Tue, 5 Feb 2013 09:43:55 -0800 (PST) Lewis Hill lewishil...@gmail.com wrote: when i click on putty on desktop it show up and then go a way but if i look in task manger i can see it there but no ui where i put ip and port or where i can save or load one Are you absolutely positive it worked before you installed Git for Windows? Does uninstalling Git for Windows fix the issue? The thing is... Git for Windows does *not* include PuTTY -- it's able to use it for SSH access, but PuTTY has to be installed separately. So I positively fail to think of *any* way installing Git could affect PuTTY. -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] GiT + Software revision + Branching
On Tue, 5 Feb 2013 06:17:56 -0800 (PST) Jacques Knipper jacques.knip...@gmail.com wrote: [...] The basic idea is that your code base evloves and at some point you decide that its current state is mature enough to eventually produce a new release after certain polishing and bug squashing. Normally you fork a new branch at this point and name it something like release-1.1. You then can continue developing on the mainline branch and do only bugfix commits on the release-1.1 branch (which can be backported back to the mainline branch using `git cherry-pick`). You can have any number of such release-X.Y branches in parallel, of course. A classical essay on this approach is [1]. It contains nice pictures so consider reading it. Note that it's not the only possible workflow, and at least you might adjust certain details if you decide to adopt it. OK, I understand, a way to use git in my case is to use branching for software release. But how to set branch for development, integration and production in parallels of releases branch? Using regular `git branch` command (or appropriate knobs in your UI front-end if you're using one). Creating branches is no magic in Git, really. There's no limits on how many branches do exist in parallel in a given repository. I abviously need to be able to work on any release of any packages at any time. No problem at all: you use `git checkout branch` to switch between branches -- this command brings your work tree to the state held in the tip of the specified branch. Maybe you have already answered to me, and I apologize if it's the case, but I need some lights on it I guess :) I have a growing feeling you somehow did not manage to grasp the concept of Git branches. I hence recommend to *play* with Git creating a throw-away repository: create a local Git repo, throw a bunch of files in it, record a number of commits on its default branch, master, fork off a devel branch, crunch a number of commits there, now create a release branch off the master's tip (using `git checkout -b release master`), record a number of commits there; now check out each branch in turn and see what happens, run `gitk --all` to visualize the situation. Experiment, that is. Reading introduction material and manuals is paramaunt for mastering a tool, but there's no substitution for practice. Another thing to consider is to start with readingh The Git Parable [1] which is the most gentle introduction to Git's approach to managing data I ever saw. 1. http://tom.preston-werner.com/2009/05/19/the-git-parable.html -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] checkout version 2.6.30.10 from the official kernel git repository
linux-stable% git tag|grep -F 2.6.30.10 v2.6.30.10 linux-stable% git remote -v origin git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git (fetch) origin git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git (push) The tag for the version you need is there, so you can just check it out and build the tree. What's the problem? Thank you for your help. your are right. The repository you mentioned contains the tag I was looking for. The repositories which I cloned before: http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git https://github.com/torvalds/linux.git Do not contain these tags. I didn't knew that the clones of the linux repositories differ that much. -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] GiT + Software revision + Branching
From: Konstantin Khomoutov flatw...@users.sourceforge.net Sent: Tuesday, February 05, 2013 6:08 PM On Tue, 5 Feb 2013 06:17:56 -0800 (PST) Jacques Knipper jacques.knip...@gmail.com wrote: [...] The basic idea is that your code base evloves and at some point you decide that its current state is mature enough to eventually produce a new release after certain polishing and bug squashing. Normally you fork a new branch at this point and name it something like release-1.1. You then can continue developing on the mainline branch and do only bugfix commits on the release-1.1 branch (which can be backported back to the mainline branch using `git cherry-pick`). You can have any number of such release-X.Y branches in parallel, of course. A classical essay on this approach is [1]. It contains nice pictures so consider reading it. Note that it's not the only possible workflow, and at least you might adjust certain details if you decide to adopt it. OK, I understand, a way to use git in my case is to use branching for software release. But how to set branch for development, integration and production in parallels of releases branch? Jacques The http://think-like-a-git.net/ site has a nice discussion about branches and 'references', and how they are simply ways to find, and not loose, your [many and various pieces of] work. Along with http://nvie.com/posts/a-successful-git-branching-model/? they give some insight. It is hard to unlearn the old habits that belong in a different era. Keep smiling, it gets easier with use (for which the advice is to use it on a small interesting project to become familiar ;-) Using regular `git branch` command (or appropriate knobs in your UI front-end if you're using one). Creating branches is no magic in Git, really. There's no limits on how many branches do exist in parallel in a given repository. I abviously need to be able to work on any release of any packages at any time. No problem at all: you use `git checkout branch` to switch between branches -- this command brings your work tree to the state held in the tip of the specified branch. Maybe you have already answered to me, and I apologize if it's the case, but I need some lights on it I guess :) I have a growing feeling you somehow did not manage to grasp the concept of Git branches. I hence recommend to *play* with Git creating a throw-away repository: create a local Git repo, throw a bunch of files in it, record a number of commits on its default branch, master, fork off a devel branch, crunch a number of commits there, now create a release branch off the master's tip (using `git checkout -b release master`), record a number of commits there; now check out each branch in turn and see what happens, run `gitk --all` to visualize the situation. Experiment, that is. Reading introduction material and manuals is paramaunt for mastering a tool, but there's no substitution for practice. Another thing to consider is to start with readingh The Git Parable [1] which is the most gentle introduction to Git's approach to managing data I ever saw. 1. http://tom.preston-werner.com/2009/05/19/the-git-parable.html -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] .gitattributes merge=ours doesn't work on msysgit?
From: Andrew Arnott Sent: Saturday, February 02, 2013 6:51 PM I've just learned about merge=ours in .gitattributes from the Pro Git book. I have a file that I always want to resolve by keep ours. So I created a .gitattributes file in the directory where the file is found with this content: version.txt merge=ours And checked in this file. Then I merged another branch into this one and the file conflict still showed up. I'm using git version 1.7.11.msysgit.1 Am I misusing this feature, or is it just not supported in this version? *** I don't believe that its is curently possible to combine the the features. It has been 'asked for' in different guises a number of times, but I don't think it has been enough of an itch for someone to code, discuss, refactor, and get adopted. Philip *** Thanks. -- -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] checkout version 2.6.30.10 from the official kernel git repository
On Tue, Feb 05, 2013 at 09:43:17PM +0100, martin mangard wrote: [...] Thank you for your help. your are right. The repository you mentioned contains the tag I was looking for. The repositories which I cloned before: http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git https://github.com/torvalds/linux.git Do not contain these tags. I didn't knew that the clones of the linux repositories differ that much. The accepted answer in that stackoverflow thread I linked you to contains the answer: Linus only ever cuts major releases, and point releases are done by other leutenants and hence contained in different repos. -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: putty ssh into ubunut 12.04 server vbox guest have git install window
On Tuesday, February 5, 2013 5:41:12 PM UTC+1, Lewis Hill wrote: I use putty to log in to my vbox ubuntu to do things. but when i install git, putty will not show its gui where i put ip address and port. I have readied i can just use git to do it too. I use git to pull down things from github to my window. I can not use putty to ssh into ubuntu vbox host. If someone can help me to set it up or how to still use putty with git install. putty to log into ubuntu git to pull down things from github into windows vbox has my ubuntu 12.04 is guest on my window 7 64 yes my ubuntu 12.04 guest has openssh on it. can someone link where or tell me how to make this work again or how to make git do it for me with out going though 20 miles of things to get it working. Note quite sure where you're going wrong here.. But I have done a write-up on how to authorize over SSH using Putty/pageant here: http://blog.tfnico.com/2012/04/my-git-setup-on-windows.html Perhaps it will help you on your way. -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: How did git(-svn) set correct links to svn:externals?
That sounds a bit fishy. I'm guessing someone actually checked in a symlink file into SVN, and that's the one that appeared in your local repo. Check it with git cat-file -p HEAD:mylibs This will print the contents of the file as it is checked into the repository. It should print something like ../mylibs% You can also do a git log on the symlink file to see who checked it in when, etc. If git complains that it is not a valid object name, then it isn't checked in, and only exists on your disk. That means you either created the symlink unknowingly (or maybe your pairing partner, etc), or git-svn has some hidden feature of doing this, but I can't find any notion of such a feature when searching around. Now, git-svn does scan for svnprops, and can do some handling of some of these (svn:ignore for example). I doubt however that it did something intelligent with the svn:externals property here. You could show us what the externals are actually set to be though. git svn propget svn:externals or something like that. -- 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.com. For more options, visit https://groups.google.com/groups/opt_out.
