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

Re: Merge tracking bug?

From: Arcady Volman <arkadiy8_at_gmail.com>
Date: Mon, 1 Dec 2008 20:13:16 +0200

Hello,
It happens to me too.
Some reasons I know of are:
- merging into working copies that have switched items inside (it creates
separate mergeinfo for subtrees and then it is being maintained)
- copying into subtrees that already had mergeinfo (it creates differences
in mergeinfo between subtrees and their parents, and the mergeinfo is
continued to be maintained separately)
- making "partial" merges (as if you was merging into Branch2/subfolder1and
not into Branch2 - this would create separate mergeinfo for
Branch2/subfolder1 and in subsequent merges into Branch2 this mergeinfo will
be maintained)

So probably it is not a bug.

I would like to know however if there are other scenarios.
Because I have a lot of redundant mergeinfo in my repo (because did merges
into WCs with switched subtreres ) and I'm considering to filter out the
mergeinfo that is not in the trunk/branch root level
(I have posted about it to users lis).
If I could assume that merges from the root of the branch to the root of the
trunk don't modify mergeinfo of trunk/branch's subfolders/files, I think I
could fix my mergeinfo that way, but I'm not sure there are no mergeinfo
modifications I'm not aware of...

Dear developers, please tell us if there are more scenarios.
And I'll also VERY appriciate if you respond to my post to the users list (
http://svn.haxx.se/users/archive-2008-11/0906.shtml)

Thank,
Arcady.

On Mon, Dec 1, 2008 at 11:18 AM, Thomas Börkel <tbo_at_ap-ag.com> wrote:

> HI!
>
> I am merging branch1 (revision x) to branch2.
>
> Modified file in that revision is
> branch1/subfolder1/subfolder11/subfolder111/file1
>
> After that, the following items have modified merge info (added revision
> x) property:
> - branch2 (this is correct)
> - branch2/subfolder1 (correct?)
> - branch2/subfolder2 (why??)
> - branch2/subfolder1/subfolder22/subfolder222/file2 (why??)
>
> Any hints would be greatly appreciated.
>
> Info: We switched to svn 1.5 this way:
> 1. upgrade clients to 1.5
> 2. upgrade server to 1.5
> 3. convert repository to 1.5 format
>
> Tried with Subversion 1.5.2 command line client and TortoiseSVN 1.5.4
> (Subversion lib 1.5.3).
>
> Thanks!
>
> Thomas
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org
>
>

-- 
Best Regards,
Arcady Volman.
Received on 2008-12-01 19:19:58 CET

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