Bad merge 6.0.2 => master ?!

classic Classic list List threaded Threaded
2 messages Options
Samuel GOUGEON Samuel GOUGEON
Reply | Threaded
Open this post in threaded view
|

Bad merge 6.0.2 => master ?!

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

--> 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 ??

Samuel


_______________________________________________
dev mailing list
[hidden email]
http://lists.scilab.org/mailman/listinfo/dev
Samuel GOUGEON Samuel GOUGEON
Reply | Threaded
Open this post in threaded view
|

Re: Bad merge 6.0.2 => master ?!

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

--> 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'
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
shows the former old code, as CR20835 on 2019-02-15 14:29


_______________________________________________
dev mailing list
[hidden email]
http://lists.scilab.org/mailman/listinfo/dev