frequently merge changes between branch and trunk?

Posted by John on Stack Overflow See other posts from Stack Overflow or by John
Published on 2010-04-28T21:44:31Z Indexed on 2010/04/28 21:47 UTC
Read the original article Hit count: 192

Filed under:

subversion

|

refactoring

My team and I are using svn branches for the first time. Before, we use to work only from the trunk.

Over the past 2 weeks, we've been refactoring and developing new code against our branch. But during that time, another developer has been making bug fixes to code in the trunk and deploying it to the production server. We would like to frequently "update" our branch with changes from the trunk to make sure we get the latest fixes. But the problem is that we're making drastic changes to our branch, and many files have been renamed. I have a feeling every "update" we do on our branch that takes changes from trunk will cause a conflict, unless we some how get subversion to recognise that fileA.html in trunk is really fileB.html in branch.

Am I using subversion branches correctly? Am I using the word "update" correctly? Are frequent "updates" in branch advisable?

© 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 refactoring

Reconciling the Boy Scout Rule and Opportunistic Refactoring with code reviews

as seen on Programmers - Search for 'Programmers'
I am a great believer in the Boy Scout Rule: Always check a module in cleaner than when you checked it out." No matter who the original author was, what if we always made some effort, no matter how small, to improve the module. What would be the result? I think if we all followed that simple… >>> More
Ubuntu 12.04 + Eclipse 64 bits key binding error

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
The text is quite extense so, this is just a part of it: !SESSION 2012-11-23 10:15:52.442 ----------------------------------------------- eclipse.buildId=I20120608-1200 java.version=1.7.0_09 java.vendor=Oracle Corporation BootLoader constants: OS=linux, ARCH=x86_64, WS=gtk, NL=en_US Command-line… >>> More
How far did DevExpress get with Javascript refactoring?

as seen on Stack Overflow - Search for 'Stack Overflow'
Over a year ago, I remember watching one of DevExpress evangelists previewing or at least promoting rich Javascript refactoring (beyond just limited intellisense) within the Visual Studio shell, I recall part of CodeRush/DevExpress product line. I was excited. On checking today (lmgtfy) I can find… >>> More
Version control of software refactoring

as seen on Stack Overflow - Search for 'Stack Overflow'
What is the best way of doing version control of large scale refactoring? My typical style of programming (actually of writing documents as well) is getting something out as quickly as possible and then refactoring it. Typically, refactoring takes place at the same time as adding other functionality… >>> More
How would you rewrite/refactor this ?

as seen on Programmers - Search for 'Programmers'
Old application that is used by 50-60.000 paying customers. Company is several hundred people big. Application has a lot of business critical code (30% of all code) written in classic asp. Application has a lot more .net code. Application has a COM+ bridge for enabling asp to "talk" to .net Organization… >>> More