On Wed, Mar 13, 2013 at 11:17 AM, Pierre Retoille <
[email protected]> wrote:
>
>
> On 13 March 2013 13:38, Pierre Retoille <[email protected]>wrote:
>
> Hello,
>
> I get a strange commit tree displayed in tortoisehg.
> As it is difficult to describe I have place an image online that shows it.
> Please see here:
> http://www.roodle.de/album/key/m9mx3u4mefq82gthmy2t/id/7794/photo/id/279736/size/big/cachecontrol
>
> As far as I understand every committed version is represented by a dot on the
> commit tree.
> But as you can see on the image, in this case there are branches that end
> without a dot.
> The green branch on the image has no anchestor. I suspect there appeared
> an error during a commit.
>
> Please would somebody point out to me what this means and how to fix it.
>
> I am not sure if this is a bug or if I made something wrong.
>
> The version I use is tortoisehg 2.7.1 and mercurial 2.5.2
>
> thank you very much
> Pierre
>
>
> This looks very much like a bug.
>
> What strikes me as odd is that rev 479 has two parents, but they are both
> rev 474, as well as two children (both are rev 480). That should never
> happen in real life, but if it did you would get the graph shown.
>
> Have you been using MQ or some other extension to modify history?
>
> Does this go away if you restart TortoiseHg?
>
>
> Please report this at https://bitbucket.org/tortoisehg/thg/issues
>
> Regards,
> Peer
>
>
> The problem does not disappear after a restart of TortoiseHg.
>
> I do not use any extension and I did not try to modify the history.
>
> I tried to figure out things a bit further. So this is what I found:
> The problem occured after one of my collegues tried to update his locale
> version tree.
> He got an error message when he tried to pull or push to our mercurial
> server.
> He then repeated the operation with the force option and did a pull, merge
> and push operation.
> I assume for some strange reason his local version tree was not recognized
> to be the same as the version tree on the server.
> But I have no idea how this could happen.
>
> The good news for me is, that a clone of the latest version 478 seems to
> fix the issue.
> However after I have done the clone the version got different numbers. The
> following image shows the version tree
> after the clone operation. You see that what was version 478 before is now
> version 465.
>
> http://www.roodle.de/album/key/m9mx3u4mefq82gthmy2t/id/7794/photo/id/279738/size/big/cachecontrol
>
> I assume there is really a bug somewhere. Please let me know what further
> information I should give, to help fixing this.
> I hope it is ok if I simply send this message to the issues mailing list
> as well.
>
>
It would be helpful to see the output of hg log --limit 10 --graph
--
Steve Borho
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
