[prev in list] [next in list] [prev in thread] [next in thread]
List: scilab-dev
Subject: Re: [Scilab-Dev] Bad merge 6.0.2 => master ?!
From: Samuel Gougeon <sgougeon () free ! fr>
Date: 2019-02-20 17:45:26
Message-ID: aa09fac7-b936-073c-3585-214bbd6a67bc () free ! fr
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
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
[Attachment #5 (text/html)]
<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">Le 20/02/2019 à 18:02, Samuel Gougeon a
écrit :<br>
</div>
<blockquote cite="mid:ae83f2ef-02a4-8971-6df6-3a0af9fafcdd@free.fr"
type="cite">
<meta http-equiv="content-type" content="text/html;
charset=windows-1252">
Hello,<br>
<br>
With the master,<br>
<br>
<font size="-1">--> [v,o]=getversion()<br>
o = <br>
!VC++ x64 tk release Feb 15 2019 17:35:24 !<br>
v = <br>
scilab-branch-master</font><br>
<br>
I was trying to use the <a moz-do-not-send="true"
href="http://bugzilla.scilab.org/show_bug.cgi?id=15577">edit()
feature</a><br>
<br>
<font face="Courier New, Courier, monospace" size="-1">--> edit
linspace 45<br>
</font><br>
merged in the master in May 2018, and already used in the master.<br>
But it is no longer available!<br>
Editing edit.sci shows that the feature has been overwritten with
the former edit.sci version!<br>
<br>
So, what happened ??<br>
</blockquote>
<br>
checkout on a <a class="gwt-InlineHyperlink"
href="https://codereview.scilab.org/20665" style="color: rgb(34,
34, 34) !important; text-decoration: underline; font-family:
sans-serif; font-size: small; font-style: normal;
font-variant-ligatures: normal; font-variant-caps: normal;
font-weight: 400; letter-spacing: normal; orphans: 2; text-align:
start; text-indent: 0px; text-transform: none; white-space:
normal; widows: 2; word-spacing: 0px; -webkit-text-stroke-width:
0px; background-color: rgb(255, 255, 255);">Merge remote-tracking
branch 'origin/6.0'</a><br>
restores the right code base, as CR20665 on 2018-12-17<br>
or as CR20856 on 2019-02-15 15:55<br>
while checkout on <a class="gwt-InlineHyperlink"
href="https://codereview.scilab.org/20632" style="color: rgb(34,
34, 34) !important; text-decoration: none; font-family:
sans-serif; font-size: small; font-style: normal;
font-variant-ligatures: normal; font-variant-caps: normal;
font-weight: 400; letter-spacing: normal; orphans: 2; text-align:
start; text-indent: 0px; text-transform: none; white-space:
normal; widows: 2; word-spacing: 0px; -webkit-text-stroke-width:
0px; background-color: rgb(255, 255, 255);">Merge origin/6.0 into
master</a><br>
shows the former old code, as CR20835 on 2019-02-15 14:29<br>
<br>
</body>
</html>
_______________________________________________
dev mailing list
dev@lists.scilab.org
http://lists.scilab.org/mailman/listinfo/dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic