On 21 Dec, Steve Fryatt wrote in message
<[email protected]>:
> On 21 Dec, John Tytgat wrote in message
> <[email protected]>:
>
> > svnmerge was in use when svn itself didn't have any merge capabilities
> > (pre v1.5 I believe) and shouldn't be use anymore.
>
> Thanks for confirming that. I've used svn for merging branches on other
> repositories without problems, but IIRC I couldn't get it to work on the
> NetSurf branch I tried it with a while back.
I've gone back to this, and found the issue that I think I remember hitting
last time. The working copy I've got is of /branches/stevef/toolbars, which
in turn was a copy of /trunk/netsurf.
On that basis, svnbook suggests that I should be able to do
$ svn merge ^/trunk/netsurf
from my working copy directory and it will try to bring in any changes made
to the trunk since the branch was taken: which should be since r11119.
However, it actually results in
$ svn merge ^/trunk/netsurf --dry-run
--- Merging r2 through r2504 into '.':
...and a fair few conflicts...
--- Merging r2505 through r11269 into '.':
...and even more conflicts...
Summary of conflicts:
Text conflicts: 49
Tree conflicts: 253
Skipped paths: 5
A lot of the proposed changes look as if they're trying to restore things
that have long since been deleted or moved somewhere else, and it seems to
be trying to change files that I don't think it should be (based on watching
the commits that have been made since I took the branch).
If I try to use megrgeinfo to see what svn thinks it needs to check, I get
svn mergeinfo ^/trunk/netsurf --show-revs eligible
svn: Retrieval of mergeinfo unsupported by '.'
Presumably I've missed some vital step somewhere, although Chapter 4 of the
SVN Book doesn't make it obvious what -- the procedure described for
branching and merging seems to be what I'm following. I've certainly made
it work on a local repository before: same client, a 1.6-something server
and a much simpler set of changes to merge (perhaps I was just lucky on
those occasions).
I'm running the svn client 1.6.6, on Ubuntu 10.04 (this isn't on RISC OS).
Googling the errors seems to point towards client/server version
mis-matches.
--
Steve Fryatt - Leeds, England Wakefield Acorn & RISC OS Show
Saturday 16 April 2011
http://www.stevefryatt.org.uk/ http://www.wakefieldshow.org.uk/
