* I can never finish a push
@ 2011-12-23 13:11 Martin L Resnick
2011-12-23 14:18 ` Thomas Rast
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Martin L Resnick @ 2011-12-23 13:11 UTC (permalink / raw)
To: git
I'm working remotely over a VERY slow line.
When I do a push it starts out fine
but after the 15 seconds it takes to push
it fails with non-fast-forward merge.
So I pull (no merge needed, its fast-forward)
and try push again. Fails again.
I can keep this up for hours on end;
pushing, pulling, pushing, pulling.
Apparently there is fast and furious development
on the branch I'm on that during my 15 seconds
of pushing someone else on-site pushes and adds
new commits before mine can finish.
Is there anyway to lock the repository while
my push is going on ?
Please don't ask why I have a slow line
or why the volume of changes that I am pushing.
Suffice it to say its military work.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: I can never finish a push
2011-12-23 13:11 I can never finish a push Martin L Resnick
@ 2011-12-23 14:18 ` Thomas Rast
2011-12-23 14:19 ` demerphq
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Rast @ 2011-12-23 14:18 UTC (permalink / raw)
To: Martin L Resnick; +Cc: git
Martin L Resnick <mresnick@bbn.com> writes:
> I'm working remotely over a VERY slow line.
>
> When I do a push it starts out fine
> but after the 15 seconds it takes to push
> it fails with non-fast-forward merge.
>
> So I pull (no merge needed, its fast-forward)
> and try push again. Fails again.
>
> I can keep this up for hours on end;
> pushing, pulling, pushing, pulling.
> Apparently there is fast and furious development
> on the branch I'm on that during my 15 seconds
> of pushing someone else on-site pushes and adds
> new commits before mine can finish.
>
> Is there anyway to lock the repository while
> my push is going on ?
Git doesn't have any locking features.
Your best bet is probably to have someone with faster access merge your
branch, e.g., by pushing your work elsewhere (to another repo or just
a different branch) and then sending them an email asking for your work
to be merged.
If you have this issue a lot, the admins of your repo server could
probably arrange for a feature where you push to a special "please merge
this" branch namespace (such as incoming/martin-resnick), and the server
then does the merge for you using locking (and of course refusing if
there was any conflict).
However, it somewhat eludes me how you can generate churn on the order
of 2000 commits (8*3600/15) per workday *to the same repository*.
Perhaps the repository should be split into subprojects? Or at the very
least, the subprojects should be handled in different repositories, from
which an integrator pulls together the daily latest-and-greatest across
all subprojects?
--
Thomas Rast
trast@{inf,student}.ethz.ch
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: I can never finish a push
2011-12-23 13:11 I can never finish a push Martin L Resnick
2011-12-23 14:18 ` Thomas Rast
@ 2011-12-23 14:19 ` demerphq
2011-12-23 14:39 ` Johannes Sixt
2011-12-23 14:39 ` Andreas Schwab
3 siblings, 0 replies; 6+ messages in thread
From: demerphq @ 2011-12-23 14:19 UTC (permalink / raw)
To: Martin L Resnick; +Cc: git
On 23 December 2011 14:11, Martin L Resnick <mresnick@bbn.com> wrote:
> I'm working remotely over a VERY slow line.
>
> When I do a push it starts out fine
> but after the 15 seconds it takes to push
> it fails with non-fast-forward merge.
>
> So I pull (no merge needed, its fast-forward)
> and try push again. Fails again.
>
> I can keep this up for hours on end;
> pushing, pulling, pushing, pulling.
> Apparently there is fast and furious development
> on the branch I'm on that during my 15 seconds
> of pushing someone else on-site pushes and adds
> new commits before mine can finish.
>
> Is there anyway to lock the repository while
> my push is going on ?
>
> Please don't ask why I have a slow line
> or why the volume of changes that I am pushing.
> Suffice it to say its military work.
Maybe try pushing a branch and then having a colleague with a faster
connection do the merge for you.
yves
--
perl -Mre=debug -e "/just|another|perl|hacker/"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: I can never finish a push
2011-12-23 13:11 I can never finish a push Martin L Resnick
2011-12-23 14:18 ` Thomas Rast
2011-12-23 14:19 ` demerphq
@ 2011-12-23 14:39 ` Johannes Sixt
2011-12-23 14:39 ` Andreas Schwab
3 siblings, 0 replies; 6+ messages in thread
From: Johannes Sixt @ 2011-12-23 14:39 UTC (permalink / raw)
To: Martin L Resnick; +Cc: git
Am 12/23/2011 14:11, schrieb Martin L Resnick:
> I'm working remotely over a VERY slow line.
>
> When I do a push it starts out fine
> but after the 15 seconds it takes to push
> it fails with non-fast-forward merge.
>
> So I pull (no merge needed, its fast-forward)
> and try push again. Fails again.
>
> I can keep this up for hours on end;
> pushing, pulling, pushing, pulling.
Your statements can only make sense if the pushed branch generates a
"non-fast-forward" is not the same branch that you pull. Show a transcript
of your commands, and in particular also tell your setting of push.default.
-- Hannes
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: I can never finish a push
2011-12-23 13:11 I can never finish a push Martin L Resnick
` (2 preceding siblings ...)
2011-12-23 14:39 ` Johannes Sixt
@ 2011-12-23 14:39 ` Andreas Schwab
3 siblings, 0 replies; 6+ messages in thread
From: Andreas Schwab @ 2011-12-23 14:39 UTC (permalink / raw)
To: Martin L Resnick; +Cc: git
Martin L Resnick <mresnick@bbn.com> writes:
> So I pull (no merge needed, its fast-forward)
If the merge is fast-forward then you aren't really having anything to
push, are you? Are you sure you are pushing the right branch?
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 6+ messages in thread
* I can never finish a push
@ 2011-12-27 4:18 Bill Zaumen
0 siblings, 0 replies; 6+ messages in thread
From: Bill Zaumen @ 2011-12-27 4:18 UTC (permalink / raw)
To: mresnick, git
Aside from the other comments, you said, "someone else on-site
pushes and adds new commits before mine can finish." If I
interpreted that correctly, the "someone else" should also be
using a link as slow as yours. Why isn't he having the same
problem you are having?
If you can track that person down (his name should show up in
the new commits you pulled), compare your config files to see
what is different.
Bill
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-12-27 4:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-23 13:11 I can never finish a push Martin L Resnick
2011-12-23 14:18 ` Thomas Rast
2011-12-23 14:19 ` demerphq
2011-12-23 14:39 ` Johannes Sixt
2011-12-23 14:39 ` Andreas Schwab
-- strict thread matches above, loose matches on Subject: below --
2011-12-27 4:18 Bill Zaumen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).