[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 28 May 2014 19:51:48 +0200

On 28.05.2014 12:56, Sergey Azarkevich wrote:
> 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 .

You can set the peg revision for the merge in TSVN the same way:
specify the url to merge from as /branches/br1_at_2 instead of just
/branches/br1.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3079401
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-05-28 19:51:53 CEST

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