[Python-Dev] Long term development external named branches and periodic merges from python

[Éric Araujo]

Le 25/11/2011 03:39, Jesus Cea a écrit :
> On 24/11/11 18:08, Éric Araujo wrote:
>>> I have a question and I would rather have an answer instead of
>>> actually trying and getting myself in a messy situation.
>> Clones are cheap, trying is cheap! <cheap wink>
> [snip valid reasons for not trying]
My reply was tongue-in-cheek :)  FYI, it’s not considered pollution to
use a tracker issue to test hooks or Mercurial integration (there’s even
one issue entirely devoted to such tests, but I can’t find its number).

>>> 5. Development of the new feature is taking a long time, and
>>> python canonical version keeps moving forward. The clone+branch
>>> and the original python version are diverging. Eventually there
>>> are changes in python that the programmer would like in her
>>> version, so she does a "pull" and then a merge for the original
>>> python branch to her named branch.
>> I do this all the time.  I work on a fix-nnnn branch, and once a
>> week for example I pull and merge the base branch.  Sometimes there
>> are no conflicts except Misc/NEWS, sometimes I have to adapt my
>> code because of other people’s changes before I can commit the
>> merge.
> That is good, because that means your patch is always able to be
> applied to the original branch tip, and that you changes work with
> current work in the mainline.
> 
> That is what I want to do, but I need to know that it is safe to do so
> (from the "Create Patch" perspective).
I don’t understand “safe”.

>>> 6. What would be posted in the bug tracker when she does a new
>>> "Create Patch"?. Only her changes, her changes SINCE the merge,
>>> her changes plus merged changes or something else?.
>> The diff would be equivalent to “hg diff -r base” and would contain
>> all the changes she did to add the bug fix or feature.  Merging
>> only makes sure that the computed diff does not appear to touch
>> unrelated files, IOW that it applies cleanly.  (Barring bugs in
>> Mercurial-Roundup integration, we have a few of these in the
>> metatracker.)
> So you are saying that "Create patch" will ONLY get the differences in
> the development branch and not the changes brought in from the merge?.
I don’t really understand how you understood what I said :(  The merge
brings in changes from default; when you diff your branch against
default later, it will not show the changes brought by the merge, but it
will apply cleanly on top of default.

Does this wording make sense?

Regards