svn - Cannot merge back into trunk, must be ancestrally related. But they *are* related as far as I understand -

-

So I'm trying to merge back into my trunk, but I'm getting errors saying that I Because they are not related to the ancestors but I am not clear why this is why. Here is the graph generated by TartiSesWN

Enter image details here

The trunk is at the bottom left (14698) Currently, I am starting with the merger in the trunk (15 9 7 9) from the top right, this is an example which claims that it is not related to the ancestors, some disparities in it That is what a coworker presented, and I'm not sure it could be the reason for this. If you notice, in the right middle, the branch with modification number 15406 actually divides a tag. It seems incredibly wrong to me, but I'm not sure. A few months ago the coworker did this (he does not work here anymore).

However, they should be related to all ancestors because they come from all trunk, right? If this is true, then why am I getting this error? Will a tag be divided?

  • The head of the trunk is 16063 (as per the figure), 14698
    • < Li> merge-source branch related , but you can check it on real repository , not picture: SVN log-v -k - search trunk- L1 Branch-URL (Ancestors of the branch so far, Modification of the last trunk)

Comments

Post a Comment

Popular posts from this blog

winforms - C# Form - Property Change -

-
I have a form that has a property named car A class with many properties. The Properties is being displayed on the current car on the basis of some user actions that are being displayed. So I have to know whether the property has been allocated or set to zero. I'm aware of INotifyPropertyChanged , but in my case I'm not sure that since this change I have changed my car properties car do not want to monitor the property. Any idea how to accomplish this? In advance thank you If you have created a true asset in your class then You should be a great and setter, you can add the code directly to the form property in order to take action on the basis of "form": Public partial category Form 1: form {public form 1 () {InitializeComponent (); } // define car square public class car {public string name = string. Empty; } // private car to keep the value of the current car private variable _car = null; // Property of public form which you can ru...
Read more

javascript - amcharts makechart not working -

-
I am trying to create an amiratars serial chart on my Durandal single page application. This chart was working fine on Chrome browser but it is not working on IE. Can you please help me in this regard. Error while using Amcharts. The Macchart () method does not support the object in this object in IE.
Read more

java - Algorithm negotiation fail SSH in Jenkins -

-
I am trying to do SSH on the local server from Jenkins, but the following error has been thrown: [SSH] Exception: Algorithm negotiation fail com.jcraft.jsch.JSchException: algorithm talk com.jcraft.jsch.Session.receive_kexinit (Session.javaatar20) at com.jcraft.jsch.Session.connect (Sesson at com.jcraft.jsch.Session.connect (Session.java:150) at org.jvnet.hudson.plugins.SSHSite.createSession (SSHSite.java:141) on failed failed org.jvnet.hudson.plugins. java: 286) .SSHS on org.jvnet.hudson.plugins.SSHBuildWrapper.executePreBuildScript (SSHBuildWrapper.java:75) on Org.jvnet.hudson.plugins.SSHBuildWrapper.setUp (SSHBuildWrapper.java59) ite.executeCommand (SSHSite.java151) on hudson.model.Build $ BuildExecution.doRun hudson.model.AbstractBuild $ AbstractBuildExecution.run (AbstractBuild.java:533) to (Build.java:154) hudson.model.Run.execute ( Run.java:1754) in ended .model.FreeStyleBuild.run (FreeStyl hudson.model.ResourceController.execute (ResourceController.java:89) on hudson.mod...
Read more