[Scilab-Dev] Bad merge 6.0.2 => master ?!

[Samuel Gougeon]

Le 20/02/2019 à 18:02, Samuel Gougeon a écrit :
> Hello,
>
> With the master,
>
> --> [v,o]=getversion()
>  o  =
> !VC++  x64  tk  release  Feb 15 2019  17:35:24  !
>  v  =
>  scilab-branch-master
>
> I was trying to use the edit() feature 
> <http://bugzilla.scilab.org/show_bug.cgi?id=15577>
>
> --> edit linspace 45
>
> merged in the master in May 2018, and already used in the master.
> But it is no longer available!
> Editing edit.sci shows that the feature has been overwritten with the 
> former edit.sci version!
>
> So, what happened ??

checkout on a Merge remote-tracking branch 'origin/6.0' 
<https://codereview.scilab.org/20665>
restores the right code base, as CR20665 on 2018-12-17
or as CR20856 on 2019-02-15 15:55
while checkout on Merge origin/6.0 into master 
<https://codereview.scilab.org/20632>
shows the former old code, as CR20835 on 2019-02-15 14:29

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.scilab.org/pipermail/dev/attachments/20190220/7089b62e/attachment.htm>