ALT Linux Team development discussions
 help / color / mirror / Atom feed
From: "Dmitry V. Levin" <ldv@altlinux.org>
To: ALT Devel discussion list <devel@lists.altlinux.org>
Subject: Re: [devel] [SCM] packages/cairo: tags/1.10.2-alt4
Date: Wed, 30 Mar 2011 01:17:41 +0400
Message-ID: <20110329211740.GB28581@altlinux.org> (raw)
In-Reply-To: <1301419676.3812.1.camel@marsh.altlinux.lan>

[-- Attachment #1: Type: text/plain, Size: 2014 bytes --]

On Tue, Mar 29, 2011 at 09:27:56PM +0400, Valery V. Inozemtsev wrote:
> В Втр, 29/03/2011 в 19:32 +0400, Dmitry V. Levin пишет:
> > On Mon, Mar 28, 2011 at 05:57:57PM +0400, Dmitry V. Levin wrote:
> > > On Mon, Mar 28, 2011 at 05:41:11PM +0400, Valery Inozemtsev wrote:
> > > > Update of /people/shrek/packages/cairo.git
> > > [...]
> > > > Changelog since `1.10.2-alt2' follows:
> > > > commit d9aede9c11c461b1bfce8a5642ee95119d3200f7
> > > > Author: Valery Inozemtsev <shrek@altlinux>
> > > > Date:   Mon Mar 28 17:40:19 2011 +0400
> > > > 
> > > >     1:1.10.2-alt4
> > > >     
> > > >     - enabled Tee backend
> > > > 
> > > > commit e569331c0a26f8a4d87fb4fb2e3cc4d34b0dc465
> > > > Merge: 68d9d35 894d1f9
> > > > Author: Valery Inozemtsev <shrek@altlinux>
> > > > Date:   Mon Mar 28 17:39:53 2011 +0400
> > > > 
> > > >     Merge commit '1.10.2-alt3' into cairo-1.10
> > > >     
> > > >     Conflicts:
> > > >     	libcairo.spec
> > > > 
> > > > commit 894d1f91a5c537996250f30aebbd9e1c23104bfe
> > > > Author: Alexey Tourbin <at@altlinux>
> > > > Date:   Wed Mar 2 23:43:50 2011 +0300
> > > > 
> > > >     1:1.10.2-alt3
> > > >     
> > > >     - rebuilt for pkgconfig
> > > >     - cairo-png.pc: disabled dependency on libpng-devel
> > > >     - cairo-drm.pc: disabled dependency on libudev-devel
> > > >     - cairo-{pdf,ps,xml}.pc: disabled dependency on zlib-devel
> > > 
> > > Валера, если ты решил откатить изменения, сделанные в 1.10.2-alt3,
> > > то об этом обязательно надо было написать в %changelog'е.
> > 
> > Понятно, откат изменений был сделан непреднамеренно,
> 
> как раз наоборот

Выглядит это именно как ошибка ручного merge.

Если изменение в 1.10.2-alt4 не было результатом ошибки merge, то
зачем оно было сделано?  Если ты считаешь изменение в 1.10.2-alt3
ошибочным, то обоснуй, пожалуйста, в чем заключается эта ошибка.

> >  придется возвратить.
> 
> в следующий раз я напишу об этом в changelog'е

Да, пожалуйста.


-- 
ldv

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

  reply	other threads:[~2011-03-29 21:17 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-28 13:57 ` Dmitry V. Levin
2011-03-29 15:32   ` Dmitry V. Levin
2011-03-29 16:08     ` Dmitry V. Levin
2011-03-29 17:30       ` Valery V. Inozemtsev
2011-03-29 17:27     ` Valery V. Inozemtsev
2011-03-29 21:17       ` Dmitry V. Levin [this message]
2011-03-30  5:36         ` Valery V. Inozemtsev
2011-03-30  6:51           ` Dmitry V. Levin
2011-03-30  8:14             ` Yuri N. Sedunov
2011-03-30 10:13               ` Dmitry V. Levin
2011-03-30 10:42                 ` Yuri N. Sedunov
2011-03-30 11:59             ` Valery V. Inozemtsev
2011-03-30 12:13               ` Yuri N. Sedunov
2011-03-30 12:33                 ` Dmitry V. Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110329211740.GB28581@altlinux.org \
    --to=ldv@altlinux.org \
    --cc=devel@lists.altlinux.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

ALT Linux Team development discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
		devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
	public-inbox-index devel

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git