RE: svn commit: r1555517 - /subversion/branches/1.8.x-r1536854/subversion/tests/cmdline/svnadmin_tests.py
From: Bert Huijben <bert_at_qqmail.nl>
Date: Sun, 23 Mar 2014 02:08:46 +0100
Hi,
Splitting the range in two commits made things much easier. probably also
I opened the conflicted second merge in DiffMerge and it automatically
Both patches introduced new functions in +- the same location of the file.
Bert
From: Stefan Fuhrmann [mailto:stefan.fuhrmann_at_wandisco.com]
On Fri, Mar 21, 2014 at 10:31 AM, Bert Huijben <bert_at_qqmail.nl
> -----Original Message-----
Hi Stefan,
Can you sync this branch with 1.8.x, resolving the conflicts caused by
You obviously beat me on that ;)
At first sight the text conflicts don't look trivial... But that is probably
Looking at the diffs, your approach of splitting
the merge into before and after the conflict
-- Stefan^2.
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.