23 Feb
2015
23 Feb
'15
12:04 p.m.
--GlnCQLZWzqLRJED8 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 02/23, Nir Soffer wrote: >=20 >=20 > ----- Original Message ----- > > From: "David Caro" <dcaroest@redhat.com> > > To: "Martin Perina" <mperina@redhat.com> > > Cc: devel@ovirt.org, "Nir Soffer" <nsoffer@redhat.com> > > Sent: Monday, February 23, 2015 2:39:42 PM > > Subject: Re: [ovirt-devel] Gerrit restart > >=20 > > On 02/23, Martin Perina wrote: > > > Hi, > > >=20 > > > this "Cannot merge" error shown in "Strategy: Rebase if Necessary" > > > line is strange. For example patch [1] is rebased on top of master > > > and locally I cannot see any path conflict, build was including > > > tests was OK. > >=20 > >=20 > > Same as Nir patch, you can't cherry-pick that patch by itself: > >=20 > > 01:36 PM ~/Work/redhat/ovirt/ovirt-engine (master|=E2=9C=94) > > dcaro@brete$ git fetch ssh://dcaro@gerrit.ovirt.org:29418/ovirt-engine > > refs/changes/59/38059/1 && git cherry-pick FETCH_HEAD > > remote: Counting objects: 19408, done > > remote: Finding sources: 100% (123/123) > > remote: Total 123 (delta 45), reused 115 (delta 45) > > Receiving objects: 100% (123/123), 40.06 KiB | 0 bytes/s, done. > > Resolving deltas: 100% (45/45), completed with 42 local objects. > > From ssh://gerrit.ovirt.org:29418/ovirt-engine > > * branch refs/changes/59/38059/1 -> FETCH_HEAD > > error: could not apply 07a90af... core: Refactor FenceActionType > > hint: after resolving the conflicts, mark the corrected paths > > hint: with 'git add <paths>' or 'git rm <paths>' > > hint: and commit the result with 'git commit' > > 01:37 PM ~/Work/redhat/ovirt/ovirt-engine (master|=E2=97=8F 19=E2=9C= =96 1=E2=9C=9A 1) > > dcaro@brete$ > >=20 > >=20 > > Once you merge the patch it depends on, It should stop showing that mes= sage. >=20 > Yea, but we do not suggest this patch alone, it is part of a series, > which gerrit knows about. >=20 > Maybe there is a new configuration to disable these messages? I don't see it in the config documentation. Feel free to open a bug to gerr= it if it bothers you enough or if you want it changed. We can also do as openstack and have our own gerrit clone with custom patch= es, but as always, that requires someone/s to maintain it and develop it. >=20 > >=20 > >=20 > > >=20 > > > Martin > > >=20 > > > [1] http://gerrit.ovirt.org/38059 > > >=20 > > >=20 > > > ----- Original Message ----- > > > > From: "Nir Soffer" <nsoffer@redhat.com> > > > > To: "David Caro" <dcaroest@redhat.com> > > > > Cc: devel@ovirt.org > > > > Sent: Monday, February 23, 2015 12:33:24 PM > > > > Subject: Re: [ovirt-devel] Gerrit restart > > > >=20 > > > > ----- Original Message ----- > > > > > From: "David Caro" <dcaroest@redhat.com> > > > > > To: devel@ovirt.org > > > > > Sent: Monday, February 23, 2015 12:54:26 PM > > > > > Subject: Re: [ovirt-devel] Gerrit restart > > > > >=20 > > > > >=20 > > > > > I've done a few tests now and everything seems to work as expecte= d, can > > > > > anyone > > > > > confirm that it's working for him? > > > >=20 > > > > It seem to work but there are few issues: > > > >=20 > > > > 1. Vertical and horizontal scrolling in the commit message pane > > > > The new version assume that the commit message is limited to > > > > about 70 characters, which is not true practically. > > > > The commit message must include sometimes much wider content, > > > > and the view should display correctly our data instead of > > > > trying to force the views of the tool authors. > > > > Example: http://gerrit.ovirt.org/36593 > > > >=20 > > > > 2. The changes view (http://gerrit.ovirt.org/#/dashboard/self) > > > > Show a new "Status" column, which has two issues: > > > > - Showing "Draft" or "Merge Conflict" - these are separate > > > > concepts > > > > - Showing "Merge Conflict" when there is no merge conflict > > > > Example: http://gerrit.ovirt.org/38044 > > > >=20 > > > > 3. The new "Conflict with" pane seems incorrect about patches > > > > which do not conflict (at least not when merged in the correct > > > > order of dependencies). > > > > Example: http://gerrit.ovirt.org/37727 > > > >=20 > > > > So this seems to be a regression. Can we test such upgrades > > > > with our data before we deploy them? > > > >=20 > > > > Nir > > > >=20 > > > > >=20 > > > > > If noone replies, I'll consider it solved > > > > >=20 > > > > > cheers > > > > >=20 > > > > > On 02/23, David Caro wrote: > > > > > >=20 > > > > > > Hi! > > > > > >=20 > > > > > > After this morning upgrade, gerrit http access has stopped work= ing, > > > > > > I'm > > > > > > trying > > > > > > to solve it but in the meantime I might have to restart gerrit a > > > > > > couple > > > > > > of > > > > > > times, you can still use git or ssh to clone repos. > > > > > >=20 > > > > > >=20 > > > > > > I'll update when finished. > > > > > >=20 > > > > > >=20 > > > > > >=20 > > > > > >=20 > > > > > > -- > > > > > > David Caro > > > > > >=20 > > > > > > Red Hat S.L. > > > > > > Continuous Integration Engineer - EMEA ENG Virtualization R&D > > > > > >=20 > > > > > > Tel.: +420 532 294 605 > > > > > > Email: dcaro@redhat.com > > > > > > Web: www.redhat.com > > > > > > RHT Global #: 82-62605 > > > > >=20 > > > > >=20 > > > > >=20 > > > > > -- > > > > > David Caro > > > > >=20 > > > > > Red Hat S.L. > > > > > Continuous Integration Engineer - EMEA ENG Virtualization R&D > > > > >=20 > > > > > Tel.: +420 532 294 605 > > > > > Email: dcaro@redhat.com > > > > > Web: www.redhat.com > > > > > RHT Global #: 82-62605 > > > > >=20 > > > > > _______________________________________________ > > > > > Devel mailing list > > > > > Devel@ovirt.org > > > > > http://lists.ovirt.org/mailman/listinfo/devel > > > > _______________________________________________ > > > > Devel mailing list > > > > Devel@ovirt.org > > > > http://lists.ovirt.org/mailman/listinfo/devel > > > >=20 > >=20 > > -- > > David Caro > >=20 > > Red Hat S.L. > > Continuous Integration Engineer - EMEA ENG Virtualization R&D > >=20 > > Tel.: +420 532 294 605 > > Email: dcaro@redhat.com > > Web: www.redhat.com > > RHT Global #: 82-62605 > >=20 --=20 David Caro Red Hat S.L. Continuous Integration Engineer - EMEA ENG Virtualization R&D Tel.: +420 532 294 605 Email: dcaro@redhat.com Web: www.redhat.com RHT Global #: 82-62605 --GlnCQLZWzqLRJED8 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJU6yVXAAoJEEBxx+HSYmnDxBwH/j3WBxOa9QFHtyGIril4uVz3 lV0RnPrWJ6FFDZJgYQdaZ87xL8j9/0mQ8MbHbhqceGx8xeYIUptK2PNyI/bQXp0g Zt9esrurpZVU8L/I7b16VK0vA7ZIWsW+UeT/i68IHCzxdDq7bRfq2b7QKQu98HgR 3hBPNOu6R4h3XVZcReySQm6X9i7N28fqnYbMjkCYhnQkl6kqSNHP4eZlqQTfsOBe 8buktzDDsA8/HzLPOFLwVxZnALRSYLXBGAHbITesl0yzwYO5n4jS0+aJ0GUfa715 WIxJa09oKGb/Qcc96PXO6U/9oM0Tid7sCenRQmGiCA8MG2b4fL++b2ZuPplakmY= =6IIj -----END PGP SIGNATURE----- --GlnCQLZWzqLRJED8--