Re: How to fix roundup.org's customizing.txt

Hi Joseph and Thomas:

In message <[email protected]>,
Joseph Myers writes:
>On Fri, 7 Sep 2018, Thomas Arendsen Hein wrote:
>> My suggestion here would be to to a 1.6 branch, branching off at
>> the 1.6.0 tag that will lead to a 1.6.1 release at some point.

This is done and pushed using the direction in the previous email. The
only issue I had was "hg show work" doesn't do anything. No errors or
output. "hg help show" shows output for showconfig.

>That's also my suggestion for when we want something based on the 1.6.0 
>release plus fixes.
>
>I'd like to suggest that if we create such a branch, it should include my 
>patch
>
>changeset:   5517:0cdf19b82354
>user:        Joseph Myers <[email protected]>
>date:        Mon Aug 20 00:50:16 2018 +0000
>summary:     Fix issue2550994: breakage caused by configparser backports.
>
>as a fix for a Python 2 issue with one of the older Python 3 patches (by 
>ESR last year) that is in 1.6.0 (so a regression in 1.6.0 relative to 
>older releases).

I did:

  hg co maint-1.6
  hg graft 0cdf19b82354

I get:

  merging CHANGES.txt
  merge: warning: conflicts during merge
  merging CHANGES.txt failed!
  couldn't find merge tool ...
  merging roundup/configuration.py
  abort: unresolved conflicts, can't continue
  (use hg resolve and hg graft --continue)
  
hg sum shows:

  parent: 5537:d698d3d843a9
   'Provisional User' example needed to have search permissions added
   parent: 5517:0cdf19b82354
    Fix issue2550994: breakage caused by configparser backports.
    branch: maint-1.6
    commit: 2 modified, 1 unresolved (merge)
    update: (current)
    mq:     (empty queue)

hg diff shows what I expect in roundup/configuration.py but there
appears to be a bunch of other changes pulled into CHANGES.txt that
were not shown in "hg diff -c 0cdf19b82354".

I don't want the

+=======
+2018-??-?? ?.?.0
+
+Features:
+
+- issue2550901: add search page to jinja2 template (Christof Meerwald)
+- issue2550982: use PBKDF2 in Python's hashlib, if available (Python
+  2.7.8+), to improve performance over bundled pure Python
...

changes. While I can CHANGES.txt so only Joseph's change is there, I
am not sure how to set it up so that I don't create more issues when
people try to merge changes from maint-1.6 to the trunk.

I don't think this will be an issue if we always modify trunk and
cherry pick them back to maint-1.6 branch, but before I check anything
in I thought I would ask for guidance.

Also I think we need to merge:

  changeset:   5527:a7c3cd2edf51
  user:        Ralf Schlatterbeck <...>
  date:        Mon Sep 03 12:00:46 2018 +0200
  files:       CHANGES.txt roundup/hyperdb.py
  description:
  No traceback for non-existent items in history

and I assume I will have a similar issue here as CHANGES.txt seems a
likely place for conflicts.

I have run "hg update --clean" in my workspace so I think I have a
clean area if my hg graft was the wrong way to do the merge.

Thoughts?

--
				-- rouilj
John Rouillard
===========================================================================
My employers don't acknowledge my existence much less my opinions.