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

Merge from a branch of a branch to trunk, losing files

From: Robert Voliva <rvoliva_at_gmail.com>
Date: Tue, 21 Apr 2015 12:20:48 -0500

Hello,

I created a branch off of trunk. Files were added to that branch. A
branch was created off of that branch. Files were added/changed in that
branch. The second branch was merged back to trunk. The files added in
the first branch, before the second branch was cut from it, were not
included in the merge.

Slightly more visual:

trunk
----project1
--------file1
(make branch)
branches
----branch1
--------file1
--------branchfile1
(make branch of branch1)
----branch2
--------file1
--------branchfile1
--------branchfile2
--------branchfile3

When you go to merge branch2 into trunk, branchfile1 is not merged. Can
someone explain this to me as to what is going on? Bug in svn?
Documentation to why you can't do this?

Thanks,
Robert Voliva
Received on 2015-04-21 19:23:10 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.