Deleting branches in git causes gitk to go wild -


I decided to remove some branches from my own (personal project) repository, which would be master After confirming on #git, the remaining branches are not really necessary.

However, as a result of gitk, the history of my repository has been completely screwed.

There is no merger at all points, and I only had 5 additional branches.

Is this normal? Is there a fix for this?

Have you tried to reload your display? Sometimes gitk gets a bit confusing, but it should be left and restarted, or reload ( file > reload , or Ctrl - F5 ) can help to recreate history in a more favorable fashion.

Edit : Now when I see the repository, then I can see what's going on.

It seems that you have done some development on the master, while working in some branches too. When you were doing this, you have sometimes merged the gurus in the branches of those branches; gitk commits to the list displayed, hence it requires a linear sequence of commits is. Whenever you branch out history, you can put that history into many possible linear orders. For example, the following structure: 

  / - c - e - \ a - bg - h \ - d - f - /

of the following Any one of the methods can be ordered:

  1. a, b, c, a, b, c, d, f, e, a, d, f, g, h < Li>
  2. A, B, C, D, E, F, G, H
  3. G, H
  4. A, B, D, C, E, F, G
  5. a, b, d, f, c, e, g, h
    6. ,
  6. A, B, D, C, F, E,

By default, gitk uses a topological ordering, which the group tries to simultaneously commit on each branch So, you can see a rational progression of commitment for each branch, instead of based on the duties of each side of the branch, when they are based on it. Therefore, for example, it can display them in order (1): 

  a - b - c - e ------------ g - h \ ----------- d - f - /

If you are just looking at a linear log, and it works fine, then this order works fine In gitk you do not often merge between the branches (as per the example given). But if you do that which you have done, then the topics are often merge into the guru , then it produces the dirt you see; Shown on Master , is shown first, then branches are created on the branches, but often the link to merge into branches of branches becomes a long-term connection. Goes that get stacked and history seems misleading (Note that the GIT does not actually store which command came from those branches, but the way in which they are given the same form, each branch Earnings That is put together, it seems).

It is that I know that it only displays gitk in chronological order see > edit the view ... < / Strong>, and check the Strictly Scheduled Date option. Now you should see that your history is showing very clearly, to launch directly in this scene, you pass - date-order option in gitk .


Comments

Post a Comment

Popular posts from this blog

sql - dynamically varied number of conditions in the 'where' statement using LINQ -

I am using my first project LINQ (in mvc), so maybe there's something very simple that I remember. However, a day of searching and experimenting does not work, so it works. I am trying to write a LINQ query (Linux to SQL) in which in many cases where the statement is different from an OR or an AND. We do not know how many conditions are going in the query till runtime. This search is for filter control, where the user can choose multiple criteria for filtering. Select from table where table.col = 1 or table.col = 2 or table.col = 7 .... 'Other number of conditions Before I just create the SQL query as a string, while looping over all the situations. However, it seems that there should be a good way to do this in LINQ. I tried to use Expression trees, but they had a second thought for this moment on my head, where the lambda function was to be executed inside the statement such as: values ​​for matchingRows = matchingRows for each value Where (function (row) row.c...
Read more

asp.net mvc - Dynamically Generated Ajax.BeginForm -

I have a problem with ASP.NET MVC Ajax forms. I generate many Ajax form in a table such as: & Lt; Input type = "submit" name = "activity" value = "add activity" / & gt; & Lt;%}% & gt; & Lt; / TD & gt; & Lt; / TR & gt; & Lt;%}% & gt; So far so good. When I post one of those forms, it gives a partial view in a div, and in this new partial view a new Ajax Beginnform (which is not in Genesis form) This second Ajax Beginnorf is exactly like the ones I got on the table, but when I post it, I do not get the "Ajax Post", but a normal post that sends me to a new page, I do not know whether the two Ajax forms What is the reason for the difference between, why is it the "dynamically generated" Ajax form behaves like a normal HTML form? By the way, I know that I can do it in different ways using javascript, but I would like to understand whether it can only be done using MVC helplars and Ajax lib...
Read more

Debug on symbian -

I am using trk for phone debug This works well for the Holorld project But when I start the project in phone debug mode 1) the load failed 2) TrkProtocolPlugin: to target the specified file Failure (please verify If any body understands what problem I am experiencing, then this problem helps me Pre-release If the application has the privileges assigned (with the appropriate certificate) itemprop = "text" > In your case, I will check: / li> If there is no conflict of application ID with any other application of device If there are problematic commands in the installation package (for example copy copy for non-accessible directories)
Read more