← Back to team overview

yade-dev team mailing list archive

Re: pending merge tips

 

Hi, Sergei!

That was because of deleting some revisions from trunk. I solved the problem
by new checkout. Maybe there is a simpler solution.

Anton



On Fri, Oct 1, 2010 at 11:33 AM, Sergei D. <sj2001@xxxxxxxxx> wrote:

> Hello.
> After "bzr st" I have a additional lines in the output:
>
> "pending merge tips: (use -v to see all merge revisions)
>  Anton Gladky 2010-09-10 1. angleRange parameter is added to facetCylinder
> to create "semi-cylinders"
>
> what is this?
>
> --
> Best regards,
> Sergei D.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-dev<https://launchpad.net/%7Eyade-dev>
> Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev<https://launchpad.net/%7Eyade-dev>
> More help   : https://help.launchpad.net/ListHelp
>

References