2:46 p.m.
----- Original Message -----
From: "David Caro" <dcaroest(a)redhat.com>
To: "Martin Perina" <mperina(a)redhat.com>
Cc: devel(a)ovirt.org, "Nir Soffer" <nsoffer(a)redhat.com>
Sent: Monday, February 23, 2015 2:39:42 PM
Subject: Re: [ovirt-devel] Gerrit restart
On 02/23, Martin Perina wrote:
> Hi,
>
> 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.
Same as Nir patch, you can't cherry-pick that patch by itself:
01:36 PM ~/Work/redhat/ovirt/ovirt-engine (master|✔)
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|● 19✖ 1✚ 1)
dcaro@brete$
Once you merge the patch it depends on, It should stop showing that message.
Yea, but we do not suggest this patch alone, it is part of a series,
which gerrit knows about.
Maybe there is a new configuration to disable these messages?
>
> Martin
>
> [1] http://gerrit.ovirt.org/38059
>
>
> ----- Original Message -----
> > From: "Nir Soffer" <nsoffer(a)redhat.com>
> > To: "David Caro" <dcaroest(a)redhat.com>
> > Cc: devel(a)ovirt.org
> > Sent: Monday, February 23, 2015 12:33:24 PM
> > Subject: Re: [ovirt-devel] Gerrit restart
> >
> > ----- Original Message -----
> > > From: "David Caro" <dcaroest(a)redhat.com>
> > > To: devel(a)ovirt.org
> > > Sent: Monday, February 23, 2015 12:54:26 PM
> > > Subject: Re: [ovirt-devel] Gerrit restart
> > >
> > >
> > > I've done a few tests now and everything seems to work as expected,
can
> > > anyone
> > > confirm that it's working for him?
> >
> > It seem to work but there are few issues:
> >
> > 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
> >
> > 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
> >
> > 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
> >
> > So this seems to be a regression. Can we test such upgrades
> > with our data before we deploy them?
> >
> > Nir
> >
> > >
> > > If noone replies, I'll consider it solved
> > >
> > > cheers
> > >
> > > On 02/23, David Caro wrote:
> > > >
> > > > Hi!
> > > >
> > > > After this morning upgrade, gerrit http access has stopped working,
> > > > 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.
> > > >
> > > >
> > > > I'll update when finished.
> > > >
> > > >
> > > >
> > > >
> > > > --
> > > > David Caro
> > > >
> > > > Red Hat S.L.
> > > > Continuous Integration Engineer - EMEA ENG Virtualization R&D
> > > >
> > > > Tel.: +420 532 294 605
> > > > Email: dcaro(a)redhat.com
> > > > Web: www.redhat.com
> > > > RHT Global #: 82-62605
> > >
> > >
> > >
> > > --
> > > David Caro
> > >
> > > Red Hat S.L.
> > > Continuous Integration Engineer - EMEA ENG Virtualization R&D
> > >
> > > Tel.: +420 532 294 605
> > > Email: dcaro(a)redhat.com
> > > Web: www.redhat.com
> > > RHT Global #: 82-62605
> > >
> > > _______________________________________________
> > > Devel mailing list
> > > Devel(a)ovirt.org
> > > http://lists.ovirt.org/mailman/listinfo/devel
> > _______________________________________________
> > Devel mailing list
> > Devel(a)ovirt.org
> > http://lists.ovirt.org/mailman/listinfo/devel
> >
--
David Caro
Red Hat S.L.
Continuous Integration Engineer - EMEA ENG Virtualization R&D
Tel.: +420 532 294 605
Email: dcaro(a)redhat.com
Web: www.redhat.com
RHT Global #: 82-62605