Erroneous cherry-pick through UI
Hi All, Yesterday cherry-picked one of my patches from master branch to ovirt-engine-3.6.1 through the Gerrit UI ( https://gerrit.ovirt.org/#/c/50039/). Then I've figured the Gerrit has pushed my new commit under /ref/tags/ovirt-engine-3.6 rather than ovirt-engine-3.6.1 branch, so CI doesn't run on that nor it could be merged. Needless to say that I didn't meant to push a change to ovirt-engine-3.6.1 tag and chose the branch from the list that UI offered to me and that appeared as "ovirt-engine-3.6.1" in the UI. Today I've cherry-picked the patch manually and this worked as expected. IMHO Gerrit should be configured in the way that prevents such mistakes, either by filtering out tags from the offered list or by not using branch names as tags. Regards, Yevgeny
David, do you know if gerrit has config option to control what will appear in the auto-complete dropdown list when choosing a branch to pick? its either a bug in gerrit, which shouldn't cherry pick into refs/tags or he can't handle tag == branch name. Yevgeny, can you try opening a bug on it? [1] also, you might want to look in the change log [2] since we are not running the latest version. [1] https://code.google.com/p/gerrit/issues/list [2] we are using 2.10.3.1. latest is https://gerrit-documentation.storage.googleapis.com/ReleaseNotes/ReleaseNote... On Tue, Dec 8, 2015 at 4:13 PM, Yevgeny Zaspitsky <yzaspits@redhat.com> wrote:
Hi All,
Yesterday cherry-picked one of my patches from master branch to ovirt-engine-3.6.1 through the Gerrit UI ( https://gerrit.ovirt.org/#/c/50039/). Then I've figured the Gerrit has pushed my new commit under /ref/tags/ovirt-engine-3.6 rather than ovirt-engine-3.6.1 branch, so CI doesn't run on that nor it could be merged. Needless to say that I didn't meant to push a change to ovirt-engine-3.6.1 tag and chose the branch from the list that UI offered to me and that appeared as "ovirt-engine-3.6.1" in the UI. Today I've cherry-picked the patch manually and this worked as expected.
IMHO Gerrit should be configured in the way that prevents such mistakes, either by filtering out tags from the offered list or by not using branch names as tags.
Regards, Yevgeny
_______________________________________________ Infra mailing list Infra@ovirt.org http://lists.ovirt.org/mailman/listinfo/infra
-- Eyal Edri Supervisor, RHEV CI EMEA ENG Virtualization R&D Red Hat Israel phone: +972-9-7692018 irc: eedri (on #tlv #rhev-dev #rhev-integ)
--9Jdw4pA1x1k2W7MG Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 12/08 16:21, Eyal Edri wrote:
David, =20 do you know if gerrit has config option to control what will appear in the auto-complete dropdown list when choosing a branch to pick? its either a bug in gerrit, which shouldn't cherry pick into refs/tags or he can't handle tag =3D=3D branch name.
=46rom the top of my head I remember that it was an open bug that's already= fixed on newer versions (but as we don't want to upgrade due to the ui changes, there's no backport possible, upstream has moved on), but might be another issue though
=20 Yevgeny, can you try opening a bug on it? [1] also, you might want to look in the change log [2] since we are not runni= ng the latest version. =20 [1] https://code.google.com/p/gerrit/issues/list [2] we are using 2.10.3.1. latest is https://gerrit-documentation.storage.googleapis.com/ReleaseNotes/ReleaseN= otes-2.11.5.html =20 =20 On Tue, Dec 8, 2015 at 4:13 PM, Yevgeny Zaspitsky <yzaspits@redhat.com> wrote: =20
Hi All,
Yesterday cherry-picked one of my patches from master branch to ovirt-engine-3.6.1 through the Gerrit UI ( https://gerrit.ovirt.org/#/c/50039/). Then I've figured the Gerrit has pushed my new commit under /ref/tags/ovirt-engine-3.6 rather than ovirt-engine-3.6.1 branch, so CI doesn't run on that nor it could be merged. Needless to say that I didn't meant to push a change to ovirt-engine-3.= 6.1 tag and chose the branch from the list that UI offered to me and that appeared as "ovirt-engine-3.6.1" in the UI. Today I've cherry-picked the patch manually and this worked as expected.
IMHO Gerrit should be configured in the way that prevents such mistakes, either by filtering out tags from the offered list or by not using bran= ch names as tags.
Regards, Yevgeny
_______________________________________________ Infra mailing list Infra@ovirt.org http://lists.ovirt.org/mailman/listinfo/infra
=20 =20 --=20 Eyal Edri Supervisor, RHEV CI EMEA ENG Virtualization R&D Red Hat Israel =20 phone: +972-9-7692018 irc: eedri (on #tlv #rhev-dev #rhev-integ)
--=20 David Caro Red Hat S.L. Continuous Integration Engineer - EMEA ENG Virtualization R&D Tel.: +420 532 294 605 Email: dcaro@redhat.com IRC: dcaro|dcaroest@{freenode|oftc|redhat} Web: www.redhat.com RHT Global #: 82-62605 --9Jdw4pA1x1k2W7MG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJWZ/urAAoJEEBxx+HSYmnDUAMH/ijhMaZdRIAoSSVlWfBkhXpI 3fN9VtzriiSB0acnfhfmdQxtyRhUW4LZBZ4576HTLoZOxhIwRPNvHpNSws3ETzOx xMVZquL4cwV4+2E/0y5IzxUP4HzCbH6NgfICm4to1jW4CHTOcHzyY2Yq2NUYLC56 mKpeU7lYK0uBgBQMh3detwVFwwC5jMZ9DNE+OdVbmhy2v4o7/VRU3q6GPWdYgyFm HYpQXwDbV0C1V20IlwGDHgO8OqlUmorRV8x3flHBEFYqiZtLKIuBup+mtAgSNQVt mUPHtyWaWaMVVM6hCE6sSJsp3Q4TFvuSEwFv1mw03Gjn8m4STJusRl46XelMyFQ= =CePh -----END PGP SIGNATURE----- --9Jdw4pA1x1k2W7MG--
On Wed, Dec 9, 2015 at 12:00 PM, David Caro <dcaro@redhat.com> wrote:
David,
do you know if gerrit has config option to control what will appear in
On 12/08 16:21, Eyal Edri wrote: the
auto-complete dropdown list when choosing a branch to pick? its either a bug in gerrit, which shouldn't cherry pick into refs/tags or he can't handle tag == branch name.
From the top of my head I remember that it was an open bug that's already fixed on newer versions (but as we don't want to upgrade due to the ui changes, there's no backport possible, upstream has moved on), but might be another issue though
also, i think we'd better for for a few more ovirt 3.6.z releases to stablize 3.6 release before upgrading, unless we'll hit a major blocker issue that will force us.
Yevgeny, can you try opening a bug on it? [1] also, you might want to look in the change log [2] since we are not
running
the latest version.
[1] https://code.google.com/p/gerrit/issues/list [2] we are using 2.10.3.1. latest is
https://gerrit-documentation.storage.googleapis.com/ReleaseNotes/ReleaseNote...
On Tue, Dec 8, 2015 at 4:13 PM, Yevgeny Zaspitsky <yzaspits@redhat.com> wrote:
Hi All,
Yesterday cherry-picked one of my patches from master branch to ovirt-engine-3.6.1 through the Gerrit UI ( https://gerrit.ovirt.org/#/c/50039/). Then I've figured the Gerrit has pushed my new commit under /ref/tags/ovirt-engine-3.6 rather than ovirt-engine-3.6.1 branch, so CI doesn't run on that nor it could be merged. Needless to say that I didn't meant to push a change to
ovirt-engine-3.6.1
tag and chose the branch from the list that UI offered to me and that appeared as "ovirt-engine-3.6.1" in the UI. Today I've cherry-picked the patch manually and this worked as expected.
IMHO Gerrit should be configured in the way that prevents such mistakes, either by filtering out tags from the offered list or by not using branch names as tags.
Regards, Yevgeny
_______________________________________________ Infra mailing list Infra@ovirt.org http://lists.ovirt.org/mailman/listinfo/infra
-- Eyal Edri Supervisor, RHEV CI EMEA ENG Virtualization R&D Red Hat Israel
phone: +972-9-7692018 irc: eedri (on #tlv #rhev-dev #rhev-integ)
-- David Caro
Red Hat S.L. Continuous Integration Engineer - EMEA ENG Virtualization R&D
Tel.: +420 532 294 605 Email: dcaro@redhat.com IRC: dcaro|dcaroest@{freenode|oftc|redhat} Web: www.redhat.com RHT Global #: 82-62605
-- Eyal Edri Supervisor, RHEV CI EMEA ENG Virtualization R&D Red Hat Israel phone: +972-9-7692018 irc: eedri (on #tlv #rhev-dev #rhev-integ)
participants (3)
-
David Caro -
Eyal Edri -
Yevgeny Zaspitsky