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

Re: Partially reintegrate changes

From: Rob van Oostrum <rvanoo_at_gmail.com>
Date: Thu, 18 Feb 2010 16:25:46 -0500

On Thu, Feb 18, 2010 at 1:42 PM, Jacob Weber <jacob_at_jacobweber.com> wrote:

> Stein Somers:
> > I see some self-refenertial mergeinfo in our /trunk, after lots of
> > merges to and from. Maybe I explicitly added it with a record-only in
> > some state of confusion. But it doesn't scare me at all. It would only
> > matter if you explicitly merged /trunk to /trunk. And then, as far as I
> > can tell, it would only cause svn merge to do less than it does without
> > the self-refenertial mergeinfo, and as far as I can tell a
> > self-referential foward merge doesn't do anything anyway.
> It does scare me a little. When I have self-referential mergeinfo, it
> causes problems with "svn log -g" (show merged revisions). It gets confused
> and shows me ALL revisions in the branch, from the time it was created. So
> the command takes forever, and returns way too much data.
> Jacob

So if and when this does occur and you can't live with the inconvenience,
just "svn propedit svn:mergeinfo" and manually clean up any references to
self. That should be safe AFAIK.

Received on 2010-02-18 22:26:22 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.