Re: svn commit: r1934506 - in subversion/branches/1.15.x: . subversion/include/private subversion/libsvn_subr
Branko Čibej <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.devel |
|---|---|
| Organization | The Apache Software Foundation |
| Message-ID | <[email protected]> |
On 6. 7. 2026 14:24, bert.qqmail.nl via dev wrote: > > -----Original Message----- > From:[email protected] <[email protected]> > Sent: Monday, July 6, 2026 2:23 PM > To:[email protected] > Subject: RE: svn commit: r1934506 - in subversion/branches/1.15.x: . subversion/include/private subversion/libsvn_subr > > > And then it was reverted (which I missed, before I pressed sent), but the merge info is still on the 1.15.x branch as of now, so re-merging doesn't work as expected. > > Bert Ouch. I was sure I reverse-merged that commit. Do you have time to fix the mergeinfo? I'm short of minutes... -- Brane > -----Original Message----- > From:[email protected] <[email protected]> > Sent: Friday, May 22, 2026 7:23 PM > To:[email protected] > Subject: svn commit: r1934506 - in subversion/branches/1.15.x: . subversion/include/private subversion/libsvn_subr > > Author: brane > Date: Fri May 22 17:22:56 2026 > New Revision: 1934506 > > Log: > * branches/1.15.x/STATUS: +0 for r1934466 and the r1934437 group. > > Modified: > subversion/branches/1.15.x/ (props changed) > subversion/branches/1.15.x/STATUS > subversion/branches/1.15.x/subversion/include/private/svn_utf_private.h > subversion/branches/1.15.x/subversion/libsvn_subr/sysinfo.c > subversion/branches/1.15.x/subversion/libsvn_subr/utf.c > subversion/branches/1.15.x/subversion/libsvn_subr/win32_xlate.c > subversion/branches/1.15.x/subversion/libsvn_subr/win32_xlate.h > > <snip> > This accidentally merged the utf-8 group you voted for. > > Bert > >