Merging Brach into Trunk...

Posted by jimbo on Stack Overflow See other posts from Stack Overflow or by jimbo
Published on 2010-05-24T15:06:19Z Indexed on 2010/05/24 15:11 UTC
Read the original article Hit count: 188

Filed under:

svn

Now I know this has been asked a few times, but i'm still not getting it...

I use Versions which is doing a great job, I am also using beansalk and they are working nicely together. However, I have been working on a branch of the trunk (sandbox) which I now want to merge back into the trunk. Versions can't do this, so it's into Terminal.

Sandbox is reversion 256 and the Trunk (because of a few other amends) is 255.

Any help on this would be great, and read a few bits, but still a little lost...

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

Developer IT

Merging Brach into Trunk... - Developer IT

Merging Brach into Trunk...

svn

Related posts about svn

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

Can't create directory named "mysql" in subversion repository

Using AuthzSVNAccessFile for controlling SVN Access produces HTTP 400 Bad Request

Multi Svn Repositories in Apache

SVN Error 403 Forbidden

Categories cloud