how can I "force" a branch upon the trunk, in the case I can't "reintegrate"?

Posted by davka on Stack Overflow See other posts from Stack Overflow or by davka
Published on 2010-05-03T17:29:31Z Indexed on 2010/05/03 17:48 UTC
Read the original article Hit count: 198

Filed under:

svn

|

merge

|

branch

|

best-practices

We created a branch from the trunk on which a major refactoring was done. Meanwhile, the trunk advanced a few revisions with some fixes. We don't want these changes on the branch, so we don't want to "catch-up" merge the trunk to the branch, because we don't want to mix the old and new code. But without this I can't reintegrate the branch back to the trunk.

Is there a way to impose the branch on the trunk "as-is"?

(an idea I considered is to undo ("reverse-merge") the trunk back to the revision where the branch started, and then it is safe to merge it on branch - nothing should happen. Then I can reintegrate. What do you think?)

thanks!

© Stack Overflow or respective owner

Related posts about svn

`svn checkout` on the SVN server causes the repo to break with a 301 error

as seen on Server Fault - Search for 'Server Fault'
We have an nginx server which proxies to a standard set-up of Apache+SVN. The nginx set-up is a very simple proxy: server { server_name svn.ourdomain.tld; location / { proxy_pass http://localhost:8080; } } Apache is set-up as follows: <Location /> DAV svn SVNParentPath… >>> More
Can't create directory named "mysql" in subversion repository

as seen on Server Fault - Search for 'Server Fault'
I have a particular problem with subversion. Environment: subversion (1.6.12dfsg-6), apache2 (2.2.16-6+squeeze7) + mod dav_svn. I can't create a directory named "mysql" or "testmysql" or add and commit a file named "mysql.txt" in my repository. There are many references to "subversion PROPSET 403… >>> More
Using AuthzSVNAccessFile for controlling SVN Access produces HTTP 400 Bad Request

as seen on Server Fault - Search for 'Server Fault'
I have a new repository on an existing subversion server that requires us to perform path based authorization within the repository. I found that the AuthzSVNAccessFile directive in apache is directly responsible for allowing this functionality. After fixing several other problems such as AuthzSVNAccessFile… >>> More
Multi Svn Repositories in Apache

as seen on Server Fault - Search for 'Server Fault'
I have a set up with apache and subversion In the apache configuration i have <Location /svn> DAV svn SVNParentPath c:/svn </Location> Now i have multiple repositories a a_b a_c a_b_c a_b_d b and i want to map them as a/svn a/b/svn a/c/svn a/b/c/svn a/b/d/svn b/svn to do… >>> More
SVN Error 403 Forbidden

as seen on Stack Overflow - Search for 'Stack Overflow'
I can't figure this out. I try to import a new project into a svn repository from Netbeans and get 403 Forbidden. I just setup svn on my serverbox today. I can get to it through a browser just fine, though its empty as I haven't imported my project yet. Apache's path for html files is /var/www I… >>> 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