From: REAL <root@mmedia2.kemsu.ru>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] .gear/rules diff: и .gitignore
Date: Fri, 14 Jan 2011 14:05:56 +0600
Message-ID: <4D3003E4.6040604@mmedia2.kemsu.ru> (raw)
In-Reply-To: <201101140920.08078.hsv@altlinux.org>
14.01.2011 13:20, Sergey Shilov пишет:
> Имеем репозиторий (erlang) с апстримной (git) историей.
> remotes/upstream/master -> upstream -> patches/alt ... /patches/... -> master
> В .gear/rules соотв. дифами последовательно делаются патчи.
> Архив тарбола (а надо-ли архивировать?) исходников делается из upstream
>
> Апстрим между релизами поменял .gitignore
> Получается, что в патчах (первом) изменение есть, а самого измененного файла в
> исходниках (по понятной причине) нет.
Я в таких случаях (т.е. когда у апстрима есть .gitignore) убиваю его
(.gitignore, не апстрим) сразу же.
--
REAL aka Евгений Ростовцев, программист ЦНИТ КемГУ
next prev parent reply other threads:[~2011-01-14 8:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-14 7:20 Sergey Shilov
2011-01-14 8:05 ` REAL [this message]
2011-01-14 8:38 ` Ivan A. Melnikov
2011-01-14 9:03 ` REAL
2011-01-14 9:08 ` Ildar Mulyukov
2011-01-14 10:00 ` REAL
2011-01-14 10:29 ` Sergey Vlasov
2011-01-14 13:26 ` Sergey Shilov
2011-01-14 14:03 ` Sergey Vlasov
2011-01-14 14:49 ` Dmitry V. Levin
2011-01-14 16:09 ` [devel] .gear/rules tar:, diff: и .gitattributes export-ignore Sergey Vlasov
2011-01-14 15:53 ` [devel] .gear/rules diff: и .gitignore Sergey Shilov
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=4D3003E4.6040604@mmedia2.kemsu.ru \
--to=root@mmedia2.kemsu.ru \
--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