[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problem with merge with 1.5.3

From: Greg Troxel <gdt_at_ir.bbn.com>
Date: Wed, 04 Mar 2009 07:47:21 -0500

Murli Varadachari <mvaradachari_at_facebook.com> writes:

> Developers here are consistently having problems using the SVN merge
> functionality. Simple merges within smaller ranges works fine -
> however if the complexity level increases [ renames, deletes etc
> within the merge range] the merge breaks down. Folks have resorted to
> either manually moving the information directly from the branch [ no
> merge ] or use a Git/Svn front-end.
> Would replacing with 1.5.7 help -- [ particularly if I am still using
> the old branches].

We are using merge tracking and had problems with stray mergeinfo being
created with 1.5.x prior to 1.5.4 or so.

Do you have lots of non-top-level mergeinfo? We have been merging whole
modules (things with TTB) only, and not allowing merging of random
files. Additionally renames have been discouraged.

I would upgrade to 1.5.7 and make all your people upgrade clients as
well. I'm not sure it's necessary, but it seems cheap compared to the
upside of having more fixes.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].

  • application/pgp-signature attachment: stored
Received on 2009-03-04 14:28:13 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.