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.
Martin
[1]
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