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

Re: Allowin no-op merges to modify mergeinfo revisited

From: Paul Burba <ptburba_at_gmail.com>
Date: Wed, 29 Oct 2008 21:10:38 -0400

On Wed, Oct 29, 2008 at 3:57 PM, Derek Foster <derek_at_ambric.com> wrote:
> Hi, folks.
>
>
>
> In March, a previous thread on this subject
> (http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=644324)
> suggested that allowing a no-op merge to modify mergeinfo was a benign
> change that would only affect users who used automated scripting.
>
>
>
> My experience is that it is a serious issue that becomes a daily or at least
> weekly problem for companies that use branches heavily.
>
>
>
> *** I think that this issue needs serious attention, and quickly. ***
>
>
>
> Here's the scenario:
>
>
>
> (FYI, we are currently using the Subversive Eclipse plugin to actually
> access Subversion.)
>
>
>
> User A creates a branch from the trunk, for a project with 100 files in it.
>
>
>
> User B creates a branch from the trunk, for the same project.
>
>
>
> User C changes one file in the trunk.
>
>
>
> User A merges from the trunk to the branch, thus creating mergeinfo on EVERY
> file in the branch, not just the one file that User C changed.

Derek,

This is unexpected. If I understand you correctly, prior to user A's
merge, there is no explicit mergeinfo on the branch and then, after
the merge, *every* file in the branch has explicit mergeinfo? Did
every file on trunk already have explicit mergeinfo prior to the
creation of branch?

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-30 02:10:53 CET

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