Roundup Robot added the comment:
New changeset 51c89a0c30b4 by Brett Cannon in branch 'default':
Issue #22992: A git developer's guide to hg.
https://hg.python.org/devguide/rev/51c89a0c30b4
--
nosy: +python-dev
___
Python tracker
Brett Cannon added the comment:
Thanks for the hard work, Demian! I don't remember how often the devguide is
updated online, but it should hopefully be no longer than a day (probably more
like an hour).
--
resolution: - fixed
stage: patch review - resolved
status: open - closed
Brett Cannon added the comment:
If Antoine or Ezio don't make any more comments or commit this themselves then
I will take the patch as-is and commit it next Friday.
Sorry for the delay, Demian, but December is always a slow month due to
holidays.
--
Demian Brecht added the comment:
Thanks for the response Brett and no worries, the delay is totally
understandable.
--
___
Python tracker rep...@bugs.python.org
http://bugs.python.org/issue22992
___
Demian Brecht added the comment:
Ping
--
___
Python tracker rep...@bugs.python.org
http://bugs.python.org/issue22992
___
___
Python-bugs-list mailing list
Unsubscribe:
Demian Brecht added the comment:
The issue was actually HAProxy rather than Apache (I had misread a line in the
documentation so my understanding of Apache header limitations was incorrect).
This was fixed by Donald today. If there are no objections, this should be good
to merge now.
Demian Brecht added the comment:
After some further investigation, this seems to be what's happening. Note: this
is based on a small amount of research and hasn't been validated by any
mercurial devs, so it might be missing key pieces: In cases where a local
topological head is unknown to a
Antoine Pitrou added the comment:
I suggest you post your findings on the mercurial mailing-list
(http://selenic.com/mailman/listinfo/mercurial, there's a gmane mirror also). I
would be surprised if there weren't an easy way of circumventing it.
--
Demian Brecht added the comment:
The issue and solution was confirmed on IRC in #mercurial by mpm (Matt
Mackall). According to him, there is also no easy way to change this behaviour
from the client. The problem isn't /really/ a Mercurial issue, but an issue
with web server specific defaults.
Demian Brecht added the comment:
I've added a section about rebasing and removed the comment about merging. Of
course, I'm assuming that the config changes can be made to Apache to allow for
this workflow.
--
Added file: http://bugs.python.org/file37412/issue22992_1.patch
Demian Brecht added the comment:
Contributors may need to update their repos before this step. It would be
good to add a note about git pull --rebase.
Working through this flow actually exposed a blocking issue as far as this
guide goes. As I understand it, because Mercurial sends hashes of
Antoine Pitrou added the comment:
Le 09/12/2014 17:36, Demian Brecht a écrit :
One option would be to increase LimitRequestFieldSize in Apache, but
that really is only a stopgap solution as that limit will be hit again
as one's local repo grows over time. It really would be nice to allow
read
Demian Brecht added the comment:
One option would be to increase LimitRequestFieldSize in Apache, but that
really is only a stopgap solution as that limit will be hit again as one's
local repo grows over time. It really would be nice to allow read only access
via SSH, which isn't affected by
Demian Brecht added the comment:
Did you actually hit this issue with hg.python.org?
Yes I did, with only one additional head:
https://gist.github.com/demianbrecht/f525cceda8a0c99794ae. This would also lead
me to believe that the public at large will also start hitting this with the
Antoine Pitrou added the comment:
I was going to say I'm skeptical that we need this but the proposed text is
well researched and well written (I'll probably learn something about bookmarks
myself, actually). Kudos!
--
nosy: +pitrou
___
Python
Demian Brecht added the comment:
I believe most points should be addressed in the updated patch. Below are
responses to other comments (those not included have resulted in changes in the
patch).
@Ezio:
4) it should be possible to use evolve instead of bookmarks, but evolve is
currently
Berker Peksag added the comment:
+# address review comments and merge
You can remove the and merge part.
+# generate patch for submission
+git diff master..issueA issueA.patch
Contributors may need to update their repos before this step. It would be good
to add a note about git
Changes by Brett Cannon br...@python.org:
--
nosy: +brett.cannon
___
Python tracker rep...@bugs.python.org
http://bugs.python.org/issue22992
___
___
Python-bugs-list
Demian Brecht added the comment:
Thanks for the comments, will try to have an updated patch today.
Trying to learn usual hg workflows might also be easier than trying to use a
git-like workflow on mercurial, so you could suggest considering them too (I
don't remember if we have anything
New submission from Demian Brecht:
Coming out of a recent thread in python-dev, it was mentioned that adding a git
developer's guide to mercurial may be beneficial to help lower the initial
barrier of entry for prospective contributors
Ezio Melotti added the comment:
I have a few comments about the patch.
About the markup:
1) you can specify the default highlight (bash) once at the top of the file,
and just use :: afterwards instead of .. code-block::;
2) the used for some headers is inconsistent with the other files;
Berker Peksag added the comment:
+The workflow of a developer might look something like this:
a core developer or a contributor? It would be good to split core developer
and contributor workflows.
+# address review comments and merge
+git checkout master
+git merge issueA
+git
22 matches
Mail list logo
