On Fri, Mar 21, 2014 at 10:31 AM, Bert Huijben <b...@qqmail.nl> wrote:
> > > > -----Original Message----- > > From: stef...@apache.org [mailto:stef...@apache.org] > > Sent: zondag 5 januari 2014 15:35 > > To: comm...@subversion.apache.org > > Subject: svn commit: r1555517 - /subversion/branches/1.8.x- > > r1536854/subversion/tests/cmdline/svnadmin_tests.py > > > > Author: stefan2 > > Date: Sun Jan 5 14:34:46 2014 > > New Revision: 1555517 > > > > URL: http://svn.apache.org/r1555517 > > Log: > > On the 1.8.x-r1536854 branch, remove a test that depends on > > /trunk features. > > > > * subversion/tests/cmdline/svnadmin_tests.py > > (verify_invalid_path_changes): Drop. > > (test_list): Update. > > Hi Stefan, > > Can you sync this branch with 1.8.x, resolving the conflicts caused by > backporting the 1.8.x-r1574868 branch? > You obviously beat me on that ;) At first sight the text conflicts don't look trivial... But that is > probably because I didn't review this patch yet. > Looking at the diffs, your approach of splitting the merge into before and after the conflict seemed to have reduced the size of the conflict. -- Stefan^2.
