subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Robert Voliva <rvol...@gmail.com>
Subject Merge from a branch of a branch to trunk, losing files
Date Tue, 21 Apr 2015 17:20:48 GMT
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

Mime
View raw message