Tip 1 -- merging heads:
A while ago Éric suggested a nice tip to make merges easier and since I
haven't seen many people using it and now I got a chance to use it again, I
think it might be worth showing it once more:
# so assume you just committed some changes:
$ hg ci Doc/whatsnew/3.3.rst -m
Le 29/09/2011 09:54, Ezio Melotti a écrit :
Tip 1 -- merging heads:
A while ago Éric suggested a nice tip to make merges easier and since I
haven't seen many people using it and now I got a chance to use it again, I
think it might be worth showing it once more:
# so assume you just committed
On 2011-09-29, at 12:07 , Victor Stinner wrote:
* I disabled the merge GUI: I lose a lot of work because I'm unable to use a
GUI to do merge, I don't understand what are the 3 versions of the same file
(which one is the merged version!?)
Generally none. By default, mercurial (and most
Le 29/09/2011 12:34, Xavier Morel a écrit :
Generally none. By default, mercurial (and most similar tools) sets up LOCAL,
BASE and OTHER. BASE is the...
Sorry, but I'm unable to remember the meaning of LOCAL, BASE and OTHER.
In meld, I have to scroll to the end of the filename so see the
Victor Stinner victor.stin...@haypocalc.com wrote:
Because a merge is a new commit, I suppose that I can do something to
get my local changes back. But, well, I just prefer the legacy (?)
merge flavor:
local
...
===
...
other
It's easier for my brain because I just have 2 versions
On 2011-09-29, at 12:50 , Victor Stinner wrote:
Le 29/09/2011 12:34, Xavier Morel a écrit :
Generally none. By default, mercurial (and most similar tools) sets up
LOCAL, BASE and OTHER. BASE is the...
Sorry, but I'm unable to remember the meaning of LOCAL, BASE and OTHER. In
meld, I have
On Wed, Sep 28, 2011 at 8:07 PM, Benjamin Peterson benja...@python.org wrote:
2011/9/28 victor.stinner python-check...@python.org:
http://hg.python.org/cpython/rev/36fc514de7f0
changeset: 72512:36fc514de7f0
...
Thanks Rusty Russell for having written these amazing C macros!
Do we really
On Sep 29, 2011, at 12:07 PM, Victor Stinner wrote:
I disabled the merge GUI: I lose a lot of work because I'm unable to use a
GUI to do merge, I don't understand what are the 3 versions of the same file
(which one is the merged version!?)
Emacs users should look at smerge-mode. It has some
Am 29.09.2011 12:50, schrieb Victor Stinner:
Le 29/09/2011 12:34, Xavier Morel a écrit :
Generally none. By default, mercurial (and most similar tools) sets up
LOCAL, BASE and OTHER. BASE is the...
Sorry, but I'm unable to remember the meaning of LOCAL, BASE and OTHER.
In meld, I have to
Am 29.09.2011 17:11, schrieb Barry Warsaw:
On Sep 29, 2011, at 12:07 PM, Victor Stinner wrote:
I disabled the merge GUI: I lose a lot of work because I'm unable to use a
GUI to do merge, I don't understand what are the 3 versions of the same file
(which one is the merged version!?)
Emacs
On Thu, Sep 29, 2011 at 2:45 AM, Victor Stinner
victor.stin...@haypocalc.com wrote:
I would like to suggest the opposite: move platform independdant macros from
pyport.h to pymacro.h :-) Suggestions:
- Py_ARITHMETIC_RIGHT_SHIFT
- Py_FORCE_EXPANSION
- Py_SAFE_DOWNCAST
Not sure about the
11 matches
Mail list logo