how to update and merge branch in netbeans?

Posted by ajsie on Stack Overflow See other posts from Stack Overflow or by ajsie
Published on 2010-04-01T18:04:06Z Indexed on 2010/04/01 18:13 UTC
Read the original article Hit count: 154

Filed under:

netbeans

|

svn

im using netbeans with svn.

i've checked out a project and then i used "copy to..." and chose to copy the trunk to a branch. i deleted the working copy of the trunk and checked out the newly created branch into a working copy and made some changes both in the trunk and the branch.

now..how do i update the branch with the new data of the trunk and how do i merge the branch with the trunk using netbeans?

is this possible? cause with "merge to..." i could only chose to merge from a remote repository to a local folder.

© Stack Overflow or respective owner

Related posts about netbeans

Netbeans doesn't start, Java fatal error, unless sudo

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
Fresh 13.10 64b Openjdk 6 is there, I just installed Netbeans 7.01 from the repo, but it doesn't work, I open then a console elect@elect-desktop:~$ netbeans # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007faebdf79325, pid=5251, tid=140388628424448 # #… >>> More
Netbeans 7.2 Missing Modules Warning

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
Everytime I start Netbeans and the splash screen shows up when it gets to the part to load the modules I receive the following error message : Warning - could not install some modules: Editor Library 2 - None of the modules providing the capability org.netbeans.modules.editor.actions could be… >>> More
Netbeans 6.8 on Ubuntu 10.04: I add php to netbeans and when I type gksu netbeans its open netbeans

as seen on Super User - Search for 'Super User'
Netbeans 6.8 Ubuntu 10.04: I add php to netbeans and when I type $ gksu netbeans its open netbeans without php editor. Only when I type $ sudo netbeans its open it properly >>> More
[netbeans] inlcude H2 database to use netbeans GUI with it

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi all, is possible include H2 database in netbeans to use it with the GUI to create table ecc ecc? Like javadb integration i means.. >>> More
Netbeans - *Easy* way to tell which Netbeans project a file belongs to

as seen on Stack Overflow - Search for 'Stack Overflow'
I was wondering if there is a way in Netbeans (v 6.8, or whatever) to have the editor tabs colored based on which project the file belongs to? Or some other easy way to distinguish which project a file belongs to. Basically my problem is that I have 3-4 netbeans projects, which all have a very… >>> More

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