Re: [scada-dev] Bug fixes published on Gerrit

[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.

Attachment: signature.asc
Description: OpenPGP digital signature