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

Re: Merge of first revision of deleted branch failed

From: BladeOfLight16 <bladeoflight16_at_gmail.com>
Date: Wed, 28 May 2014 07:38:11 -0400

On Wed, May 28, 2014 at 6:56 AM, Sergey Azarkevich <azarkevich_at_gmail.com>wrote:

> 6. Try merge from command line:
> No errors:
>
>
> C:\temp\all\trunk>svn merge "^/branches/br1_at_2" -c 2
> --- Recording mergeinfo for merge of r2 into '.':
> G .
>

Sounds like a bug in SVN to me. Merging a deleted branch should either be
an error (since it no longer exists) or should result in deleting the
entire trunk (!!!!). (The latter could be a merge conflict error if trunk
has changes since the branch was created.) Those are the only 2 logical
outcomes, in my opinion.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-05-28 13:39:02 CEST

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