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

Merge of first revision of deleted branch failed

From: Sergey Azarkevich <azarkevich_at_gmail.com>
Date: Wed, 28 May 2014 13:56:10 +0300

1. Create /trunk with some content in revision 1
2. Create branch /branches/br1 of /trunk in revision 2
3. Try merge into trunk:

URL merge from:
file:///C:/temp/svn-greek-tree-repo/branches/br1_at_2
Revisions range to merge:
2

Next, Merge -> Merge OK

---
Command: Merging revisions 1-2 of
file:///C:/temp/svn-greek-tree-repo/branches/br1 into C:\temp\all\trunk,
respecting ancestry
Recording mergeinfo for merge of r2: C:\temp\all\trunk
Updated: C:\temp\all\trunk
: C:\temp\all\trunk
Completed!:
---
Revert merged changes.
4. Delete /branches/br1
5. Try step 3 again.
Merge failed:
---
Command: Merging revisions 1-2 of
file:///C:/temp/svn-greek-tree-repo/branches/br1 into C:\temp\all\trunk,
respecting ancestry
Error: File not found: revision 3, path '/branches/br1'
Completed!:
---
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   .
Version info:
TortoiseSVN 1.8.7, Build 25475 - 64 Bit , 2014/05/05 20:52:12
Subversion 1.8.9, -release
apr 1.5.1
apr-util 1.5.3
serf 1.3.5
OpenSSL 1.0.1g 7 Apr 2014
zlib 1.2.8
C:\temp\all\trunk>svn --version
svn, version 1.8.9 (r1591380)
   compiled May  6 2014, 20:28:35 on x86-microsoft-windows
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3079360
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-05-28 12:56:21 CEST

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