Fix mergeinfo on three branches that does not agree with the expected offset
of 840074 from the load of the Tigris Subversion repository into the ASF
repository.

See: http://svn.haxx.se/dev/archive-2010-03/0160.shtml

* 1.6.x
* 1.6.x/CHANGES

  The original offset problem was on '/subversion/branches/1.6.x-r40452' and
  '/subversion/branches/1.6.x-r40452/CHANGES', but the 1.6.x-r40452 branch
  was reintegrated back to 1.6.x in r891009.  To fix this, I did the
  following:

  1) Reverse merged the reintegration:

     svn merge --ignore-ancestry -c-891009 ^/subversion/branches/1.6.x
     1.6.x-WC

  2) Reverted *all* but mergeinfo changes to 1.6.x and 1.6.x/CHANGES:

  3) Did a record only merge of all the work done on the 1.6.x-r40452
     branch:

     svn merge --record-only -r880529:890996
     ^/subversion/branches/1.6.x-r40452@890996 1.6.x-WC

  4) Did are record only merge of the revisions merged from trunk to
     to the 1.6.x-r40452 branch during its lifetime:

     svn merge --record-only -r880524:880526 ^^/subversion/trunk 1.6.x-WC

* fs-successor-ids

  This branch still exists.  The mergeinfo offset was wrong starting in
  r880536 when the branch copied from trunk@880535.

  To fix this, I did the following:

  1) Merged the difference between the branch at the first revision it
     existed and trunk at the revision the branch was copied from:

     svn merge --ignore-ancestry
     ^/subversion/branches/fs-successor-ids@880536
     ^/subversion/trunk@880535 fs-successor-ids-WC

     This returns the mergeinfo to that that of trunk when it was copied,
     so it once again has the right offset.

   This branch has never been synced with trunk, but there was a merge to
   it in r880537, where r866919, r868662, and r880528 were merged from an
   earlier incarnation of the branch.  The mergeinfo for that merge is only
   partially correct, the first two revisions *predate* the revision
   (r866918) the branch was created:

     subversion/branches/fs-successor-ids:863264,865007,880528

   I fixed those two revisions is via a propedit.

* python-3-compatibility

  Like fs-successor-ids, this branch still exists, unlike fs-successor-ids,
  the mergeinfo offsets were correct when the branch was created and didn't
  get corrupted until last sync from trunk to the branch in r880589.  To
  fix this I did the following:

  1) Reverse merged only the mergeinfo changes made by r880589:
 
     svn merge --ignore-ancestry --depth empty -c-880589
     ^/subversion/branches/python-3-compatibility
     python-3-compatibility-WC

  2) Used --record-only to create the correct sync info from trunk:

     svn merge --record-only -r880499:880588 ^/subversion/trunk
     python-3-compatibility-WC


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/python-3-compatibility@929295 13f79535-47bb-0310-9956-ffa450edef68