How to 'fix' a SVN branch/tree conflict? -

-

I acquired a software project and put everything using STVN on STVN (tow). If the trunk is below the root then the whole application is in the trunk (which I tagged 1.0). For my first big feature, I created a feature branch called "Dev".

I can merge the changes in the Dev branch in the trunk branch without any problems (as I used to fix small bugs). Once my facility was completed, I merged back in the trunk branch till everything worked fin until this point. Under the new code, the new code showed the new feature properly, but then I committed a commitment (the result of the merge of commitment) and now every time I try to merge with root or dev branch, the SVN will be "Tree" on many files Tribal "even files that did not touch since the merge. I tried to resolve the conflicts without success.

I am the sole developer, so I do not really care about major changes in the repository. But if I can, I still want to keep a history of all the files.

What would be the best way to fix this problem? Is there any way that I can tag all the latest files in the root trunk as a "fixed" version of the file?

More info

  1. Yes, 'main' and 'trunk' are the same thing I have clarified my question.
  2. When you have merged back from the convenience branch, did you first merge another to eliminate the latest trunk changes from the trunk? "Yes, the trunk was up-to-date. The god branch had made all the changes in the trunk.
  3. " Everything was messed up ": What I meant was committed, but then I started merge with the trunk, for the trunk, the SVN complains about the 'tree collision'.
  4. I have more than 200 tree collisions. So, what I see is "all Accept "is the command

[edit] Eleoime Solutions My problem Or was not corrected, however, it was correct with the issues of the SVN version. Currently (2009-10-28), Assembla is using SVN v1.5.1 and my turtle was SVN v1.6. This is the reason It was that I was struggling with such trees. I tried to use the solution according to the link of Elohim and it did not work (I tried to merge several times before trying to merge the two-head merge. Files are not rooted

Seeing that a broken merge with a head will still not work, I decided to remove the ".svn" all the files in my branch folder, Copy the files to the root folder and commit one

should help.

Otherwise, do you use Turtle SVN customer 1.6. X? It seems ...


Comments

Post a Comment

Popular posts from this blog

asp.net - Javascript/DOM Why is does my form not support submit()? -

-
This is my first time working with asp.net and javascript, so I do not know very good web resources, or Much about javascript debugging I have to find out that on line oFormObject.submit (); Microsoft JScript Runtime Error: Object does not support this property or method I am using the link to work as a button because I am terrible in aesthetics and I think That link will look more professional than a table of 50 buttons. I have read that this solution can cause problems with browsers due to pre-rendering of my links and many additional traffic and problems, but CSS gives me a button like a link, which has issues of alignment and difference seemed to. & lt ;! DOCTYPE HTML PUBLIC "- // W3C // DTD HTML 4.01 // N" "http://www.w3.org/TR/html4/strict.dtd"> & Lt; Html xmlns = "http://www.w3.org/1999/xhtml" & gt; & Lt; Head & gt; & Lt; Link rel = "stylesheet" type = "text / css" href = "defect differen
Read more

sockets - Delphi: TTcpServer, connection reset when reading -

-
I am trying to implement one for Delphi, but there are some problems with communication. Fitnesse will start my process, and give me a portmember as a command line argument. Then I should make a socket on the port number given to me, and fitness will connect to that port I am using a TCPCP server for the job: < Pre> TcpServer1.LocalPort: = ParamStr (ParamCount); TcpServer1 Active: = true; On OnEXEPT () -Event, I send the protocol version to use as specified in the protocol. Process TForm1.TcpServer1Accept (From: TOBject; ClientSocket: TCustomIpClient); Var s: ansistring; Start clientSocket. Syndrome ('slim - v 0.0', # 10); SetLength (S, 6); ClientSketts Receavebook (S, 6); End; When I call ReceiveBuf (), the process ends, and fitness throws an exception: java.net.SocketException: connection Reset I have seen what sent and received. It shows that my code sends the protocol version, fitness sends back a message, and when I try to get this message
Read more

javascript - Classic ASP "ExecuteGlobal" statement acting differently on two servers -

-
I have a strange problem that I really do not know. In addition to developing a new ASP.NET site, I have to support the old "classic ASP" site. It is written in VBScript with a batch of JavaScript functions. Many of the JavaScript functions include 'files' Everything is fine on our production system (which security is controlled by another group - this is a military installation) Debugging them once did not work I). However, I have a fix for a vague bug that needs to be fully tested and some functions do not run under the "local" copy of the website that runs on my PC. For the record, I am running IIS 5.1 on XP. The problem is that some Javascript functions are running "OK" on the production server, but when they use it as a server, they are not defined on my PC what is happening that last Programmer, for some reason, has decided to put some functions in a series of files, which according to the observations, imitate the "need_once
Read more