Daniel Shahaf wrote: > Johan Corveleyn wrote on Mon, 16 Jul 2018 00:46 +0200: > > It seems something went wrong with the "Post-release housekeeping" > > commits on the 1.10.x branch, r1835806 (post 1.10.1) and r1835936 > > (post 1.10.2): they contain an empty diff for svn_version.h ... weird. > > An empty diff is the result of an 'svnmucc put' that didn't change the > file. (As in, 'svn revert iota; svnmucc put iota iota') > > What happened is, in r1935935 STATUS said "Status of 1.10.2:" and > svn_version.h said "#define SVN_VERSION_PATCH 0"; then release.py > changed "2" to "3" on both of these lines. That effected the correct > change to STATUS and no change to svn_version.h.
On releasing 1.10.0, 'release.py create-tag' failed to bump revisions on the branch [1] and so I fixed the 'STATUS' file manually in r1828869 to say '1.10.1', but I did not notice that 'svn_version.h' also should have been updated. So 'svn_version.h' remained at '1.10.0'. > The thing is, replace_in_place() has a 'raise RuntimeError' statement > designed to catch precisely this situation. I don't understand why it > didn't fire. > > Julian, just to double check, you rolled 1.10.2 using the trunk version of > release.py, right? I used trunk 'release.py'. First I had to fix it [2], following that previous issue [1]. I will take a closer look now. (I'm online now, so we can discuss on IRC for a bit, until we have something definite to report here.) [1] dev@ thread "release.py create-tag failed to update STATUS", 2018/04/11, https://lists.apache.org/thread.html/7bebefc47a85210df4b7624a4b6a5e55dc003240948a97e399934c2f@%3Cdev.subversion.apache.org%3E [2] http://svn.apache.org/r1835936 -- - Julian
