{"thread":{"id":"9889","subject":"Git pull fails on a repository > 1.5G.","startedAt":"2007-09-17T08:59:24Z","lastAt":"2007-09-17T19:18:06Z","messageCount":3,"participants":["pradeep singh","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"53275","messageId":"a901b49a0709170159g477525bcr5383a1a051ae5e3d@mail.gmail.com","threadId":"9889","inReplyTo":null,"subject":"Git pull fails on a repository > 1.5G.","fromName":"pradeep singh","fromEmail":"pradeep.rautela@gmail.com","sentAt":"2007-09-17T08:59:24Z","receivedAt":"2007-09-17T08:59:24Z","isPatch":false,"sender":{"key":"pradeep.rautela@gmail.com","avatar":null},"body":"Hi All,\n\nI am using git at work for a rather big repository. Size is around\n1.5-1.8Gigs now.\nMy git version is 1.5.2.4.\n\nThe remote repo has some changes to a file with some simple printk's\nsome some code changes.\n\nI have my git repo in /mnt/reiser/project .\n\nI changed to the my repo.\n\ni did a git-pull ssh://user1@10.100.205.34/opt/test/project test .[to\npull from another test machine].\n\nI got some conflicts in a file but in some important files it did not update it.\n\nAny hints whats wrong with my technique or is there something wrong with git?\n\nBTW the two machines have different versions of git. The remote\nmachine have git-1.4.4 from ubuntu repo.\n\nThanks\n---\nPradeep\n"},{"id":"53280","messageId":"a901b49a0709170239t39123a27t3ff3462855c7eb57@mail.gmail.com","threadId":"9889","inReplyTo":"a901b49a0709170159g477525bcr5383a1a051ae5e3d@mail.gmail.com","subject":"Re: Git pull fails on a repository > 1.5G.","fromName":"pradeep singh","fromEmail":"pradeep.rautela@gmail.com","sentAt":"2007-09-17T09:39:44Z","receivedAt":"2007-09-17T09:39:44Z","isPatch":false,"sender":{"key":"pradeep.rautela@gmail.com","avatar":null},"body":"PS:- please CC me , as i am not subscribed to git list.\nOn 9/17/07, pradeep singh <pradeep.rautela@gmail.com> wrote:\n> Hi All,\n>\n> I am using git at work for a rather big repository. Size is around\n> 1.5-1.8Gigs now.\n> My git version is 1.5.2.4.\n>\n> The remote repo has some changes to a file with some simple printk's\n> some some code changes.\n>\n> I have my git repo in /mnt/reiser/project .\n>\n> I changed to the my repo.\n>\n> i did a git-pull ssh://user1@10.100.205.34/opt/test/project test .[to\n> pull from another test machine].\n>\n> I got some conflicts in a file but in some important files it did not update it.\n>\n> Any hints whats wrong with my technique or is there something wrong with git?\n\nJust to add.\nIf i pull tags with\n$git-pull ssh://user1@10.100.205.34/opt/test/project test\ni get them.\ndoing a git-merge v-1.0b does not reflect any changes but a git-branch\nnew_test v-1.0b makes new_test branch which has the changes.\nAgain git-merge new_test fails miserably, it says no conflicts though\nthere are conflicts.\n\nWhat is happening here? :-/\n\nI am puzzled.\nCan anybody please help me???\n\nthanks\n\n-- \nPradeep\n"},{"id":"53340","messageId":"7v7imp14pd.fsf@gitster.siamese.dyndns.org","threadId":"9889","inReplyTo":"a901b49a0709170239t39123a27t3ff3462855c7eb57@mail.gmail.com","subject":"Re: Git pull fails on a repository > 1.5G.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-09-17T19:18:06Z","receivedAt":"2007-09-17T19:18:06Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"pradeep singh\" <pradeep.rautela@gmail.com> writes:\n\n>> The remote repo has some changes to a file with some simple printk's\n>> some some code changes.\n>>\n>> I have my git repo in /mnt/reiser/project .\n>>\n>> I changed to the my repo.\n\n\"changed\" meaning you did:\n\n          $ cd /mnt/reiser/project\n\nright?\n\n>> i did a git-pull ssh://user1@10.100.205.34/opt/test/project test .[to\n>> pull from another test machine].\n\nIt is not clear if this \"another test machine\" is the \"remote\nrepo with printk\" you earlier talked about.  Are they the same?\nI am assuming they are.  What was the command?  Was\n\n\t$ git-pull ssh://user1@10.100.205.34/opt/test/project test .\n\nwhat you typed (I am hoping that you did not give the extra \" .\"\nat the end)?\n\n>> I got some conflicts in a file but in some important files it\n>> did not update it.\n\nYou earlier talked about \"printk's to a file\" in the remote, and\nthen you talk about two other classes of files.  How are they\nrelated?  Is the \"files it did not update it\" being \"important\"\na helpful information to diagnose this issue?\n\nGetting conflicts is perfectly normal.  If you changed something\nand the branch you are pulling from changed the area nearby, you\nwould get conflicts and need to resolve.  Are you saying the\nfile you got conflict in should not have get conflicts?  If so,\nwhat makes you think so?  They did not see parallel developments\nwhile they diverged?\n\nIt also is perfectly normal if \"git-pull\" does not rewrite every\nfile in your work tree.  If a file was modified by you (in the\nrepository /mnt/reiser/project) since the history diverged from\nthe history \"another test machine\" has, while the repository on\nthat another test machine did not modify that file in any way,\nthe merge result is _your_ version and in such a case \"git-pull\"\nwill keep your copy intact.\n\nWhat made you think that some files that were not updated should\nhave been updated?  IOW, are you sure they should have been\nupdated while git did not update them?  What error messages did\nyou get when you did the above \"pull\"?  What did they say?\n\n> What is happening here? :-/\n>\n> I am puzzled.\n> Can anybody please help me???\n\nSorry, you provided too little information to start even\nspeculating if there is anything wrong going on, let alone\ndiagnosing if there indeed is something wrong.\n"}]}