hg branching + log question
I'm getting my feet wet with the cpython sources and Mercurial. I'm a bit confused -- when I checkout a branch, eg. 3.3, and I do an 'hg log', why do I see log messages for other branches? I'm expecting different branches to be kept discreetly. If I switch to 3.3, then I expect to see only 3.3 commits and changes. Also, what does the branch 'default' mean in this context? Since cpython is concerned with 3 major concurrent release tracks, why would there even be a default ? Does it just point to 3.4? Thanks. -- A musician must make music, an artist must paint, a poet must write, if he is to be ultimately at peace with himself. - Abraham Maslow
On Mon, Mar 17, 2014, at 13:02, Sean Felipe Wolfe wrote:
I'm getting my feet wet with the cpython sources and Mercurial. I'm a bit confused -- when I checkout a branch, eg. 3.3, and I do an 'hg log', why do I see log messages for other branches?
That's just the way Mercurial works. If you only want to see messages on the current branch, do "hg log -b .".
I'm expecting different branches to be kept discreetly. If I switch to 3.3, then I expect to see only 3.3 commits and changes.
Also, what does the branch 'default' mean in this context? Since cpython is concerned with 3 major concurrent release tracks, why would there even be a default ? Does it just point to 3.4?
It's what will become 3.5 as of today.
On Mon, 17 Mar 2014 13:02:23 -0700 Sean Felipe Wolfe <ether.joe@gmail.com> wrote:
I'm getting my feet wet with the cpython sources and Mercurial. I'm a bit confused -- when I checkout a branch, eg. 3.3, and I do an 'hg log', why do I see log messages for other branches?
This is a classic hg question, you would get the answer by asking Mercurial for help: hg log --help :) Basically, to restrict the log to a given branch, just use the -b option: hg log -b 3.3. Regards Antoine.
Ah well, ok. That seems pretty counterintuitive to me though. I suppose Hg has its quirks just like ... that other DCVS system ... :P On Mon, Mar 17, 2014 at 1:07 PM, Antoine Pitrou <solipsis@pitrou.net> wrote:
On Mon, 17 Mar 2014 13:02:23 -0700 Sean Felipe Wolfe <ether.joe@gmail.com> wrote:
I'm getting my feet wet with the cpython sources and Mercurial. I'm a bit confused -- when I checkout a branch, eg. 3.3, and I do an 'hg log', why do I see log messages for other branches?
This is a classic hg question, you would get the answer by asking Mercurial for help: hg log --help :)
Basically, to restrict the log to a given branch, just use the -b option: hg log -b 3.3.
Regards
Antoine.
_______________________________________________ Python-Dev mailing list Python-Dev@python.org https://mail.python.org/mailman/listinfo/python-dev Unsubscribe: https://mail.python.org/mailman/options/python-dev/ether.joe%40gmail.com
-- A musician must make music, an artist must paint, a poet must write, if he is to be ultimately at peace with himself. - Abraham Maslow
I have also found hg difficult to get to grips with from cold (but I like it). The hg command and its help are good, as Antoine says, but if I'm doing something complex, the visualisation of the change sets that TortoiseHG provides is invaluable (and of other invisible structures, such as the MQ patch stack). The context menus are also a clue to what you might want to do next when you can't guess what word comes after hg help ... . I found it helpful to practice extensively on something that doesn't matter. The gap for me is still examples of what I want "done well". Clearly the Python repos represent complex work, but even accepting it is all done well, are without much commentary. This is very good: http://hgbook.red-bean.com/read/ , but there are hints it has not kept up. This also: http://legacy.python.org/dev/peps/pep-0385/ Jeff Allen On 17/03/2014 23:53, Sean Felipe Wolfe wrote:
Ah well, ok. That seems pretty counterintuitive to me though. I suppose Hg has its quirks just like ... that other DCVS system ... :P
On Mon, Mar 17, 2014 at 1:07 PM, Antoine Pitrou <solipsis@pitrou.net> wrote:
On Mon, 17 Mar 2014 13:02:23 -0700 Sean Felipe Wolfe <ether.joe@gmail.com> wrote:
I'm getting my feet wet with the cpython sources and Mercurial. I'm a bit confused -- when I checkout a branch, eg. 3.3, and I do an 'hg log', why do I see log messages for other branches? This is a classic hg question, you would get the answer by asking Mercurial for help: hg log --help :)
Basically, to restrict the log to a given branch, just use the -b option: hg log -b 3.3.
Regards
Antoine.
_______________________________________________ Python-Dev mailing list Python-Dev@python.org https://mail.python.org/mailman/listinfo/python-dev Unsubscribe: https://mail.python.org/mailman/options/python-dev/ether.joe%40gmail.com
Le 18/03/2014 04:05, Jeff Allen a écrit :
I found it helpful to practice extensively on something that doesn't matter. The gap for me is still examples of what I want "done well". Clearly the Python repos represent complex work, but even accepting it is all done well, are without much commentary. This is very good: http://hgbook.red-bean.com/read/ , but there are hints it has not kept up.
This also: http://legacy.python.org/dev/peps/pep-0385/
Does the developer’s guide help? http://docs.python.org/devguide/patch.html http://docs.python.org/devguide/faq.html#version-control Regards
participants (5)
-
Antoine Pitrou -
Benjamin Peterson -
Jeff Allen -
Sean Felipe Wolfe -
Éric Araujo