How do I fix line ending issues after migrating from SVN to git? -

-

I just cloned a subdivision repository to GIT 

  git svn clone - Studied - writer-file = ourcommitters.txt svn: //svn.internalserver.com

While doing so, I had 'git flag' core.autocrlf set to 'true' - just In the case of the case.

After a long time, the command is over. As a result, I removed the GIT repository a bit (removing unintended branches, preparing tags etc.) and now everything looks great and works well. The repository is hosted on a Linux box, and other Linux Cloning to work on boxes works really well.

However, I saw a problem: When cloning the repository on the Windows box, some files are modified while switching the branches. For example, I do this: / P> 

  git clone svn: //our.git.server/foo git position # Everything is clean GIT checkout - original / maintenance # maintenance branch switch to GIT status # Everything is clean GIT checkout Master # Back Master Branch GIT Status # Some files are modified !

While doing a 'git diff', I think that the modified files do not show anything at their line end. While doing a little research, we noticed that these files are sub-versions In the CR-LF line end (instead of the end of the LF line) was checked by mistake, and this bug was converted into our GIT repository.

Is there any way to fix this problem in our repository (so far it was not cloned too many times, so 'cleanup committ' or 'without liking') would it be okay to write some history? Maybe we can quietly rewrite the affected items in any way?

Alternatively, we can fix it in Subversion - and then re-issue the 'git svn clone' command. It starts to work incrementally (it will decide the last line now fixed) but again - it makes a commitment I wonder if I can get around it.

It was found that the easiest way was to fix the faulty files in subversion, and then 

  git svn clone - stdlayout - author-file = ourcommitters.txt svn: //svn.internalserver.com

Comments

Post a Comment

Popular posts from this blog

MySql variables and php -

-
I am getting an error with php in order to format mysql_query () in php to format this string What is the right way? SELECT SELECT SELECT (*) Agents @AgentCount; User_Agent_English, User_Angent_Oursal, US.___Gent_Aginal, COUNT (User_Agent_Percade) ACC, COUNT (*) / (AgentCount) Percentage by agents user_agent_preser order DEC limit limit 50; In PHP, how am i setting $ query $ query = "SELECT count (*) agents @ agentcount; SELECT user_agent_parsed, User_agent_original , COUNT (user_agent_parsed) ascount, COUNT (*) / (@AgentCount) as a percentage by user_agent_parced by URI date DESC limit 50 "; This exact query will work properly if I put it in MySQL directly through a command line session. Do I need to release two separate php calls from mysql_query () and store the results first? I get the following error: There is an error in your SQL syntax; Instead of using a sub-selection and instead of using the 'SELECT user_agent_parsed, user_agent_original, ne...
Read more

url rewriting - How to implement the returnurl like SO in PHP? -

-
This URL should work even after the rewrite. Is this possible? Otherwise, I can only hardcoded everything If you are trying to create a login system with redirection You need to use the HTTP_REFERER header to find out where the user came from so that you can send it back there. The best way to do this is to use something like this in your login form: // - Login php & Lt; Input type = "password" name = "password" /> & Lt; Input type = "hidden" name = "returnrelale" value = "& lt ;? php echo $ redirectURL ;? & gt;" / & Gt; & Lt; / Form & gt; Please note that some ISP, browser or proxy will delete the referrer header, so you can not rely on each user to work fully. If you use a statement, to check whether the header exists or not, you can send those users back to the homepage or whatever. Edit If you are looking to use $ _SERVER ['REQUEST_URI'], if you are running Apache It sho...
Read more

Which Python client library should I use for CouchdB? -

-
I am starting to experiment with CouchDB because it looks like we have the right solution to certain problems That all the work will be on a new project, which does not have any legacy dependency, which the client library will suggest you use, and why? If we overlap any of the OS. Freeband is available only in the collection of its ports, but asks to use the library's project website. None of those people are Ubuntu, which is only with ships, since those two OSAs are not common in libraries, I am probably installing something from source (and hopefully if I have time, then Ubuntu and FreeBSD People pack the package). For those interests, I want to use CouchDB as a convenient intermediate storage space for data passed between different services - think of a message bus system, but less formalities with. For example, we have daemons that download and pars the web page, then send an interesting bit to other daemons for further processing. Many of them are ill-defined until the...
Read more