> -----Original Message-----
> From: Gleason, Todd [mailto:tgleason_at_impac.com]
> Sent: donderdag 5 februari 2009 2:47
> To: Mark Phippard; Jens-Heiner Rechtien
> Cc: users_at_subversion.tigris.org
> Subject: RE: OpenOffice.org has migrated to subversion
>
> > >
> > > Actually, it's practically impossible to use --reintegrate due to
> > > subtree mergeinfo, so we have to fall back to
> >
> > Are you using 1.5.5 client? It is a lot smarter about knowing when
> > that subtree mergeinfo is OK? Also, have you considered cleaning up
> > this mergeinfo? The 1.5.5 client also no longer creates it when
> > copy/rename happens, which should remove all of the incorrect
> creating
> > of subtree mergeinfo. Generally, if using 1.5.5, you should only
> have
> > subtree mergeinfo if you have done subtree merges.
>
> Could you clarify something for me? Are most of the merge-related
> improvements (performance, behavior, memory consumption) done on the
> client end? Will upgrading clients (from 1.5.2) without upgrading the
> server (from 1.5.2) result in a lot better behavior? Assume that the
> user has no problem with doing an svn update prior to merging.
Yes upgrading the clients will help here.
The client is responsible for creating the merge information and processing
the actual merge.
> In general it's been tough for me to tell what is on the server and
> what
> is on the client. Looking at
> http://svn.collab.net/repos/svn/tags/1.5.5/CHANGES doesn't seem to help
> me much here.
Looking at that list (1.5.3-1.5.5) the Cyrus, BDB, the svn_repos_* and proxy
changes are server side.. The rest is client side.
Bert
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1106510
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-05 13:34:00 CET