How are deleted and renamed/moved files handled when merging a feature branch with trunk and reinteg

Posted by Michael Repucci on Stack Overflow See other posts from Stack Overflow or by Michael Repucci
Published on 2010-05-14T21:51:32Z Indexed on 2010/05/14 21:54 UTC
Read the original article Hit count: 264

Filed under:

subversion

|

merge

|

reintegrate

|

trunk

|

branch

I've got a big-ish project that needs a lot of work on a new feature, so I planned on using a branch to do this work. I haven't had to do this before, and I just wanted to get assurance from an experienced Subversion user that things "should" work smoothly.

What I'm especially concerned with is how well Subversion handles deleted, renamed/moved files between a branch and the trunk. That is, if multiple files are deleted or renamed/moved in the branch, but those files continue to be used and receive changes in the trunk, will merges with the trunk still proceed without a hitch (reworking the branch, of course, as necessary)?

Also, when I then reintegrate the branch with the trunk, if the files differ greatly in name (or existence) between the trunk and branch, will the reintegration be difficult? Will the files deleted (moved) in the branch now be deleted (moved) in the trunk, or will files linger and conflicts emerge?

The SVN book didn't clear up these questions for me, so your experience would be greatly appreciated. Thank you!

© Stack Overflow or respective owner

Related posts about subversion

Does Subversion have an analogue to VSS's links?

as seen on Stack Overflow - Search for 'Stack Overflow'
I am migrating a Visual SourceSafe code repository to Subversion and I am running into a problem. Here is a simplified layout of our current source code tree (in VSS): project_root\ |-libs\ |-tools\ |-arch_1\ | |-include | |-source |-arch_2\ |-include |-source My problem… >>> More
Complex reporting on subversion (possibly Export Subversion log into database for reporting)

as seen on Stack Overflow - Search for 'Stack Overflow'
What is the best way to do complex reporting on subversion logs like the following for each file? file, directory, last revision date, previous revision date(where revision date is at least 30 older than last), days diff(between revision dates) Since Subversion allows on revision to change multiple… >>> More
Can't install py-subversion on freebsd 8.2

as seen on Super User - Search for 'Super User'
I'm trying to install python bindings for subversion: # cd /usr/ports/devel/py-subversion # make ===> Patching for py26-subversion-1.6.15 ===> Applying extra patch /usr/ports/devel/py-subversion/../../devel/subversion/files /bindings-patch-subversion--bindings--swig--perl--native--Makefile… >>> More
Access denied error when building project in Xcode after fresh SVN checkout

as seen on Stack Overflow - Search for 'Stack Overflow'
I am seeing 2 strange access denied errors which I cant solve. This error occurs when a colleague checks out the project in SVN and it tries to find a file in my downloads folder - there is nothing in my download folder though: ProcessPCH /var/folders/f0/f01B78egHdyWY62v5MABJk+++TM/-Caches-/com… >>> More
Are there any subversion "dash board" web applications that can show me a list of recent commits from all my repositories?

as seen on Programmers - Search for 'Programmers'
I am looking for something like a subversion dashboard that at the very least can show me commits from across a group of repositories. Is there anything like this available? Since it could just as well be dead simple and I can't find anything immediately I am thinking if just scratching my own itch… >>> More

Related posts about merge

Foreach PHP Error

as seen on Stack Overflow - Search for 'Stack Overflow'
I am receiving the following foreach error on my PHP file and I have no idea how to fix it. Does anyone have any ideas? When I load the page I get this: Warning: Invalid argument supplied for foreach() in /home/mysite/public_html/merge/class/global_functions.php on line 61 Warning: Invalid argument… >>> More
TFS 2010 SDK: Smart Merge - Programmatically Create your own Merge Tool

as seen on Geeks with Blogs - Search for 'Geeks with Blogs'
Technorati Tags: Team Foundation Server 2010,TFS SDK,TFS API,TFS Merge Programmatically,TFS Work Items Programmatically,TFS Administration Console,ALM The information available in the Merge window in Team Foundation Server 2010 is very important in the decision making during the merging process… >>> More
mail merge e-mail in Word 2007 with attachment

as seen on Super User - Search for 'Super User'
Is there a simple way to mail merge with Word 2007 and add an attachment? I've searched google, and all results point to pasting in VB code. I want to a small team of novice users to be able to mail merge e-mails and add attachments. Does anyone know a simple way of doing this without code? >>> More
Improving Partitioned Table Join Performance

as seen on SQL Blog - Search for 'SQL Blog'
The query optimizer does not always choose an optimal strategy when joining partitioned tables. This post looks at an example, showing how a manual rewrite of the query can almost double performance, while reducing the memory grant to almost nothing. Test Data The two tables in this example use… >>> More
Simple Branching and Merging with SVN

as seen on Dot net Slackers - Search for 'Dot net Slackers'
Its a good idea not to do too much work without checking something into source control. By too much work I mean typically on the order of a couple of hours at most, and certainly its a good practice to check in anything you have before you leave the office for the day. But what if your… >>> More