[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Incorrect merge
From: |
Eli Zaretskii |
Subject: |
Re: Incorrect merge |
Date: |
Mon, 01 Nov 2010 19:54:36 +0200 |
> From: Chong Yidong <address@hidden>
> Date: Mon, 01 Nov 2010 12:02:31 -0400
> Cc: Michael Albinus <address@hidden>, Emacs <address@hidden>
>
> Ken Brown <address@hidden> writes:
>
> > It looks like the following change got merged with the trunk inadvertently:
> >
> > revno: 100136
> > committer: Michael Albinus <address@hidden>
> > branch nick: emacs-23
> > timestamp: Mon 2010-10-25 13:46:21 +0200
> > message:
> > * dbusbind.c (Fdbus_call_method_asynchronously)
> > (Fdbus_register_signal, Fdbus_register_method): Check, whether
> > `dbus-registered-objects-table' is initialized.
> >
> > Must not be synchronized with the trunk.
>
> Should be fixed now, thanks.
Should we have improved procedures to avoid such incidents in the
future? This isn't the first time things get merged that shouldn't.
I wonder how many such cases are still there on the trunk, undetected.
- Incorrect merge, Ken Brown, 2010/11/01
- Re: Incorrect merge, Chong Yidong, 2010/11/01
- Re: Incorrect merge, Chong Yidong, 2010/11/01
- Re: Incorrect merge,
Eli Zaretskii <=
- Re: Incorrect merge, Juanma Barranquero, 2010/11/01
- Re: Incorrect merge, Eli Zaretskii, 2010/11/01
- Re: Incorrect merge, Juanma Barranquero, 2010/11/01
- Re: Incorrect merge, Stephen J. Turnbull, 2010/11/01
- Re: Incorrect merge, Stefan Monnier, 2010/11/02
- Re: Incorrect merge, Óscar Fuentes, 2010/11/02
- Re: Incorrect merge, Stephen J. Turnbull, 2010/11/02
- Re: Incorrect merge, Óscar Fuentes, 2010/11/02
- Re: Incorrect merge, Stephen J. Turnbull, 2010/11/02
- Re: Incorrect merge, Óscar Fuentes, 2010/11/02