You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Thomas Börkel <tb...@ap-ag.com> on 2008/10/14 10:50:14 UTC
Merge tracking bug?
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: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merge tracking bug?
Posted by Silver Zachara <si...@gmail.com>.
Thomas Börkel napsal(a):
> 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).
>
This would interested me too ;)
--
-------------------------------------------------------------------
--== Silver Zachara ==--
- pgp - http://radeonvmod.ic.cz/keys/silver.zachara@gmail.com.asc -