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

RE: Double file entries after merge of moves/refactoring;possiblebug?

From: Hermanns, Horst <h.hermanns_at_telekom.de>
Date: Thu, 18 Jun 2009 09:42:15 +0200

Hi,

sorry if I was bit unclear.

With "it works" I meant that it works as expected without tree conflict
and without double file entries in the repository.
The creation an relocation of the file in one branch leads (after the
merge of this two changes to another branch) also to one resulting file
in the merge target branch. In the other case (merge in 2 rev ranges) I
got two files in the target branch, one in the old an the other in the
new location.

Expect to the outputs which show no tree conflicts and seems to be
correct (first 'A dir1\file1' followed in the next merge by a 'D
dir1\file1' and add in the new location 'A dir1\dir2\file1') I got
two files in the respository after the (single) commit of both merge
results:

# svn merge -r142:143 https://...bra1 .
--- Merging r143 into '.':
A dir1
A dir1\file1

# svn merge -r143:144 https://...bra1 .
--- Merging r144 into '.':
A dir1\dir2
A dir1\dir2\file1
D dir1\file1

# svn status (!seems to be ok, no 'dir1\file1')
 M .
A + dir1
A + dir1\dir2
A + dir1\dir2\file1

... commit

# svn list https://...bra2/dir1
file1 (!wrong/double entry 'dir1\file1')

# svn list https://...bra2/dir1/dir2
file1 (correct location 'dir1\dir2\file1')

Regards
Horst

-----Original Message-----
From: Stefan Sperling [mailto:stsp_at_elego.de]
Sent: Wednesday, June 17, 2009 5:44 PM
To: Hermanns, Horst
Cc: users_at_subversion.tigris.org
Subject: Re: Double file entries after merge of
moves/refactoring;possiblebug?

On Wed, Jun 17, 2009 at 05:22:26PM +0200, Hermanns, Horst wrote:
> Hi,
>
> thanks for the answer.
>
> I've checked the same scenario with subversion 1.6.2 (Server and
> Client), unfortunaly with the same results.
>
> If it is possible to merge the changes in one rev-range (p.e.
> -r142:144
> -> commit) it works, but if I merge in the changes in 2 revision
> -> ranges

What do you mean when you say "it works"?
Do you mean the merge result is as you expect, and if so, what is it?
Or do you mean that a tree conflict is flagged?

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2363079

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-18 09:43:19 CEST

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