From: Afanasov Dmitry <ender@altlinux.org>
To: devel@lists.altlinux.org
Subject: Re: [devel] rpmbph with git branches
Date: Sun, 24 May 2009 21:38:48 +0400
Message-ID: <20090524173847.GA18713@utvuk.ender.rk> (raw)
In-Reply-To: <20090524202104.09f00cda.bga@altlinux.org>
[-- Attachment #1: Type: text/plain, Size: 830 bytes --]
On Sun, May 24, 2009 at 08:21:04PM +0400, Grigory Batalov wrote:
> On Sun, 24 May 2009 17:36:20 +0400, Afanasov Dmitry wrote:
> > да-да, сталкивался с таким. самое тяжелое понять - а на кой ляд тут
> > merge, и откуда он вообще идет? а если впоследствии и branch
> > переименовали, или мержили откуда-нибудь из git://..., то вообще ахтунг.
>
> gitk не помогает? =)
помогает конечно. куда ж без gitk/qgit :) но времени ест не меряно. на
ffmpeg.git два рабочих дня ухлопал, а они не всегда есть в резерве.
излишняя сложность - всегда потеря времени, которого всегда не хватает.
> > больше всего сбивает с мысли - -s ours. этот ousr же в commit message по
> > умолчанию не отмечается.
>
> Я у таких коммитов пишу "fake merge".
и это здорово. в mplayer.git такого не было :(
--
С уважением
Афанасов Дмитрий
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2009-05-24 17:38 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-18 9:58 Eugene Prokopiev
2009-05-18 14:50 ` Max Ivanov
2009-05-18 15:00 ` Alexey I. Froloff
2009-05-18 15:25 ` Afanasov Dmitry
2009-05-18 15:32 ` Max Ivanov
2009-05-18 16:53 ` Eugene Prokopiev
2009-05-18 16:59 ` Alexey I. Froloff
2009-05-19 4:15 ` Eugene Prokopiev
2009-05-24 13:09 ` Michael Shigorin
2009-05-24 13:36 ` Afanasov Dmitry
2009-05-24 16:21 ` Grigory Batalov
2009-05-24 17:38 ` Afanasov Dmitry [this message]
2009-05-24 13:40 ` Aleksey Avdeev
2009-05-18 17:00 ` Igor Vlasenko
2009-05-18 17:04 ` Led
2009-05-18 15:40 ` Anton Farygin
2009-05-18 16:49 ` Eugene Prokopiev
2009-05-18 17:53 ` Anton Farygin
2009-05-18 18:10 ` Aleksey Avdeev
2009-05-18 19:37 ` Anton Farygin
2009-05-18 19:49 ` Aleksey Avdeev
2009-08-04 15:29 ` [devel] Автоматические release (was: rpmbph with git branches) Aleksey Avdeev
2009-08-04 16:40 ` Michael Shigorin
2009-08-04 17:07 ` [devel] Автоматические release Aleksey Avdeev
2009-08-04 17:13 ` Led
2009-08-04 17:55 ` Aleksey Avdeev
2009-08-07 14:59 ` Aleksey Avdeev
2009-08-07 19:56 ` Aleksey Avdeev
2009-08-08 9:12 ` [devel] I: У buildreq проблемы с %(<shell-coms>)? (was: Автоматические release) Aleksey Avdeev
2009-08-08 10:02 ` Alexey Tourbin
2009-08-08 11:47 ` [devel] I: У buildreq проблемы с %(<shell-coms>)? Aleksey Avdeev
2009-08-05 4:20 ` [devel] Автоматические release (was: rpmbph with git branches) Eugene Prokopiev
2009-08-05 4:30 ` Eugene Prokopiev
2009-08-05 11:50 ` [devel] Автоматические release Aleksey Avdeev
2009-05-18 20:06 ` [devel] rpmbph with git branches Vitaly Lipatov
2009-05-18 20:05 ` Aleksey Avdeev
2009-05-19 4:14 ` Eugene Prokopiev
2009-05-19 5:03 ` Vitaly Lipatov
2009-05-19 5:42 ` Anton Farygin
2009-05-19 7:53 ` Eugene Prokopiev
2009-05-19 8:06 ` Anton Farygin
2009-05-19 8:39 ` Eugene Prokopiev
2009-05-20 8:21 ` Vitaly Lipatov
2009-05-19 5:41 ` Anton Farygin
2009-05-19 9:56 ` Aleksey Avdeev
2009-05-19 10:34 ` Anton Farygin
2009-05-19 10:39 ` Max Ivanov
2009-05-19 10:58 ` Anton Farygin
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=20090524173847.GA18713@utvuk.ender.rk \
--to=ender@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