{"thread":{"id":"29240","subject":"I can never finish a push","startedAt":"2011-12-23T13:11:15Z","lastAt":"2011-12-23T14:39:44Z","messageCount":5,"participants":["Martin L Resnick","Thomas Rast","demerphq","Johannes Sixt","Andreas Schwab"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"181637","messageId":"4EF47DF3.9080809@bbn.com","threadId":"29240","inReplyTo":null,"subject":"I can never finish a push","fromName":"Martin L Resnick","fromEmail":"mresnick@bbn.com","sentAt":"2011-12-23T13:11:15Z","receivedAt":"2011-12-23T13:11:15Z","isPatch":false,"sender":{"key":"mresnick@bbn.com","avatar":null},"body":"I'm working remotely over a VERY slow line.\n\nWhen I do a push it starts out fine\nbut after the 15 seconds it takes to push\nit fails with non-fast-forward merge.\n\nSo I pull (no merge needed, its fast-forward)\nand try push again. Fails again.\n\nI can keep this up for hours on end;\npushing, pulling, pushing, pulling.\nApparently there is fast and furious development\non the branch I'm on that during my 15 seconds\nof pushing someone else on-site pushes and adds\nnew commits before mine can finish.\n\nIs there anyway to lock the repository while\nmy push is going on ?\n\nPlease don't ask why I have a slow line\nor why the volume of changes that I am pushing.\nSuffice it to say its military work.\n"},{"id":"181638","messageId":"87liq3l6bl.fsf@thomas.inf.ethz.ch","threadId":"29240","inReplyTo":"4EF47DF3.9080809@bbn.com","subject":"Re: I can never finish a push","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2011-12-23T14:18:38Z","receivedAt":"2011-12-23T14:18:38Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Martin L Resnick writes:\n\n> I'm working remotely over a VERY slow line.\n>\n> When I do a push it starts out fine\n> but after the 15 seconds it takes to push\n> it fails with non-fast-forward merge.\n>\n> So I pull (no merge needed, its fast-forward)\n> and try push again. Fails again.\n>\n> I can keep this up for hours on end;\n> pushing, pulling, pushing, pulling.\n> Apparently there is fast and furious development\n> on the branch I'm on that during my 15 seconds\n> of pushing someone else on-site pushes and adds\n> new commits before mine can finish.\n>\n> Is there anyway to lock the repository while\n> my push is going on ?\n\nGit doesn't have any locking features.\n\nYour best bet is probably to have someone with faster access merge your\nbranch, e.g., by pushing your work elsewhere (to another repo or just\na different branch) and then sending them an email asking for your work\nto be merged.\n\nIf you have this issue a lot, the admins of your repo server could\nprobably arrange for a feature where you push to a special \"please merge\nthis\" branch namespace (such as incoming/martin-resnick), and the server\nthen does the merge for you using locking (and of course refusing if\nthere was any conflict).\n\n\nHowever, it somewhat eludes me how you can generate churn on the order\nof 2000 commits (8*3600/15) per workday *to the same repository*.\nPerhaps the repository should be split into subprojects? Or at the very\nleast, the subprojects should be handled in different repositories, from\nwhich an integrator pulls together the daily latest-and-greatest across\nall subprojects?\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"181639","messageId":"CANgJU+VEpYkttoBp0SUNcROH6-HmGX5v7aVXGZFO_U2aZHv8mA@mail.gmail.com","threadId":"29240","inReplyTo":"4EF47DF3.9080809@bbn.com","subject":"Re: I can never finish a push","fromName":"demerphq","fromEmail":"demerphq@gmail.com","sentAt":"2011-12-23T14:19:06Z","receivedAt":"2011-12-23T14:19:06Z","isPatch":false,"sender":{"key":"demerphq@gmail.com","avatar":null},"body":"On 23 December 2011 14:11, Martin L Resnick wrote:\n> I'm working remotely over a VERY slow line.\n>\n> When I do a push it starts out fine\n> but after the 15 seconds it takes to push\n> it fails with non-fast-forward merge.\n>\n> So I pull (no merge needed, its fast-forward)\n> and try push again. Fails again.\n>\n> I can keep this up for hours on end;\n> pushing, pulling, pushing, pulling.\n> Apparently there is fast and furious development\n> on the branch I'm on that during my 15 seconds\n> of pushing someone else on-site pushes and adds\n> new commits before mine can finish.\n>\n> Is there anyway to lock the repository while\n> my push is going on ?\n>\n> Please don't ask why I have a slow line\n> or why the volume of changes that I am pushing.\n> Suffice it to say its military work.\n\nMaybe try pushing a branch and then having a colleague with a faster\nconnection do the merge for you.\n\nyves\n\n\n-- \nperl -Mre=debug -e \"/just|another|perl|hacker/\"\n"},{"id":"181640","messageId":"4EF4928E.4090306@viscovery.net","threadId":"29240","inReplyTo":"4EF47DF3.9080809@bbn.com","subject":"Re: I can never finish a push","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2011-12-23T14:39:10Z","receivedAt":"2011-12-23T14:39:10Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 12/23/2011 14:11, schrieb Martin L Resnick:\n> I'm working remotely over a VERY slow line.\n> \n> When I do a push it starts out fine\n> but after the 15 seconds it takes to push\n> it fails with non-fast-forward merge.\n> \n> So I pull (no merge needed, its fast-forward)\n> and try push again. Fails again.\n> \n> I can keep this up for hours on end;\n> pushing, pulling, pushing, pulling.\n\nYour statements can only make sense if the pushed branch generates a\n\"non-fast-forward\" is not the same branch that you pull. Show a transcript\nof your commands, and in particular also tell your setting of push.default.\n\n-- Hannes\n"},{"id":"181641","messageId":"m262h773nz.fsf@igel.home","threadId":"29240","inReplyTo":"4EF47DF3.9080809@bbn.com","subject":"Re: I can never finish a push","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2011-12-23T14:39:44Z","receivedAt":"2011-12-23T14:39:44Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Martin L Resnick writes:\n\n> So I pull (no merge needed, its fast-forward)\n\nIf the merge is fast-forward then you aren't really having anything to\npush, are you? Are you sure you are pushing the right branch?\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"}]}