Git pull fails on a repository > 1.5G.

Hi All,

I am using git at work for a rather big repository. Size is around 1.5-1.8Gigs now. My git version is 1.5.2.4.

The remote repo has some changes to a file with some simple printk's some some code changes.

I have my git repo in /mnt/reiser/project .

I changed to the my repo.

i did a git-pull ssh://user1@10.100.205.34/opt/test/project test .[to pull from another test machine].

I got some conflicts in a file but in some important files it did not update it.

Any hints whats wrong with my technique or is there something wrong with git?

BTW the two machines have different versions of git. The remote machine have git-1.4.4 from ubuntu repo.

Thanks --- Pradeep

PS:- please CC me , as i am not subscribed to git list. On 9/17/07, pradeep singh <pradeep.rautela@gmail.com> wrote:

Just to add. If i pull tags with $git-pull ssh://user1@10.100.205.34/opt/test/project test i get them. doing a git-merge v-1.0b does not reflect any changes but a git-branch new_test v-1.0b makes new_test branch which has the changes. Again git-merge new_test fails miserably, it says no conflicts though there are conflicts.

What is happening here? :-/

I am puzzled. Can anybody please help me???

thanks

"pradeep singh" <pradeep.rautela@gmail.com> writes:

"changed" meaning you did:

          $ cd /mnt/reiser/project

right?

It is not clear if this "another test machine" is the "remote repo with printk" you earlier talked about. Are they the same? I am assuming they are. What was the command? Was

	$ git-pull ssh://user1@10.100.205.34/opt/test/project test .

what you typed (I am hoping that you did not give the extra " ." at the end)?

You earlier talked about "printk's to a file" in the remote, and then you talk about two other classes of files. How are they related? Is the "files it did not update it" being "important" a helpful information to diagnose this issue?

Getting conflicts is perfectly normal. If you changed something and the branch you are pulling from changed the area nearby, you would get conflicts and need to resolve. Are you saying the file you got conflict in should not have get conflicts? If so, what makes you think so? They did not see parallel developments while they diverged?

It also is perfectly normal if "git-pull" does not rewrite every file in your work tree. If a file was modified by you (in the repository /mnt/reiser/project) since the history diverged from the history "another test machine" has, while the repository on that another test machine did not modify that file in any way, the merge result is _your_ version and in such a case "git-pull" will keep your copy intact.

What made you think that some files that were not updated should have been updated? IOW, are you sure they should have been updated while git did not update them? What error messages did you get when you did the above "pull"? What did they say?

Sorry, you provided too little information to start even speculating if there is anything wrong going on, let alone diagnosing if there indeed is something wrong.