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

Merge with two revisionID fails

From: Andrea Maleci <andrea.antonio.maleci_at_ubiss.it>
Date: Tue, 22 Jan 2013 07:21:31 -0800 (PST)

Hi all,
I'm trying to merge two revisions on another branch.
First revision adds a new file, second modifies it.

I expect to have no problems, but if I do it on TSVN in the same merge operation I have a tree conflict on my file.
If I do it in two different merge operations even without commit, everything works.
If I do it using SVN cmd-line everything works.
It seems that I can't do update merges on new added files, in the same merge.

I'm using TSVN 1.7.10 on SVN server 1.6.6.

Thanks,
Andrea

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3045297

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-01-22 16:36:10 CET

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