Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [scada-dev] Bug fixes published on Gerrit
Hi,

ok, thanks!

I think I got your changes, and I will try to solve the HD start issue in a OS independent way.

Your changes should be in the master and 0.2.x-branch and I will make a maintenance release this week.

Thanks

Jens

On 04/27/2015 07:55 PM, Gabriel Avellaneda wrote:
Hello Jens,

Please check https://git.eclipse.org/r/#/c/46587/ for the MSI Vesion validation fix.
and https://git.eclipse.org/r/#/c/46588/ for the fix for the HD base path property variable unescaping fix.
(In windows works (tested) and in linux (not tested yet) it will also works because the in linux it will be not escaped, so the regex will not match and work as always.) Please abandon this if you are not convinced, but think about that we need this on windows to run the hd with system properties in the path.

Please let me know if you need anything else or to work on other issues.

Thanks,
Gabriel.-


2015-04-27 10:09 GMT-03:00 Jens Reimann <jens.reimann@xxxxxxxxxxxxxxx>:
Hi,

fine thanks! No problem! Take your time ;-) I will make the first build today locally and then can merge in the patches from master.

Thanks

Jens


On 04/27/2015 03:05 PM, Gabriel Avellaneda wrote:
Hi Jens,

How are you?

Sorry for the delay, I was very busy last week. I will do this in a few hours when I come back to home.

Thanks,
Gabriel.-

2015-04-27 9:17 GMT-03:00 Jens Reimann <jens.reimann@xxxxxxxxxxxxxxx>:
Hi,

I just wanted to check if you did find the time for rebasing?

We plan to make a maintenance release this week and I would like to include your changes.

Jens


On 04/21/2015 04:26 PM, Gabriel Avellaneda wrote:
Hello Jens,

Thanks for your review of the changes. The rebase think is they way to go.

I will try to do this today,

Thanks!
Gabriel.-

2015-04-21 5:33 GMT-03:00 Jens Reimann <jens.reimann@xxxxxxxxxxxxxxx>:
Hi,

Sorry for the troubles, but I just tried to merge your change with gerrit. I am also still new to this whole gerrit process.

However when you made the changes (formatting) you created a new patch, based on the old. Instead of updating the old patch.

This causes a dependency in gerrit, which I cannot resolve, since you are the author of the patch. Originally the right thing would have been to update your original change.

Now what we can do is:

a) You rebase your change https://git.eclipse.org/r/#/c/45712 to erase the previous commit. This can be done using an interactive rebase, skipping the first change and providing the actual changes in the "reformatted" commit. Pushing again to "change/45712" should resolve this.
b) You make the change again, push it again to gerrit. But based on the original master!
c) I do a manual cherry-pick

a) and b) are ok with me, but I don't want to do c) since I am not sure it this would keep your "authored" status.

Sorry for all those troubles!

Jens


On 04/09/2015 05:05 PM, Gabriel Avellaneda wrote:
Hello Jürgen/Jens,

I've committed the changes to Gerrit. A nice feature that I saw was that based on a comment like "Fixed bug #463919" on the commit, Bugzilla automatically associated the Gerrit change with the bug reported. That did not worked for the other commits because I have used another format for the comment.

Best regards,
Gabriel.-


_______________________________________________
scada-dev mailing list
scada-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/scada-dev


-- 
IBH SYSTEMS GmbH
D-85235 Pfaffenhofen an der Glonn
Läutenring 43
Geschäftsführer / CEO: Dr. Thomas Heitzig

Amtsgericht München
Handelsregister Nummer  HRB 197959
USt ID: DE267945175

Office Munich
D 80992 München
Agnes-Pockels-Bogen 1
T +49 89 18 9 17 49 0

The information transmitted is intended only for the person or entity
to which it is addressed and may contain confidential and/or pivileged
material. Any review, retransmission, dissemination or other use of,
or taking of any action in reliance upon, this information by persons
or entities other than the intended recipient is prohibited. If you
received this in error, please contact the sender and delete the
material from any computer.

_______________________________________________
scada-dev mailing list
scada-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/scada-dev



_______________________________________________
scada-dev mailing list
scada-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/scada-dev



_______________________________________________
scada-dev mailing list
scada-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/scada-dev



_______________________________________________
scada-dev mailing list
scada-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/scada-dev



_______________________________________________
scada-dev mailing list
scada-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/scada-dev



_______________________________________________
scada-dev mailing list
scada-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/scada-dev


Back to the top