From: Vitaly Lipatov <lav@altlinux.ru>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] Перевод wine-vanilla в git
Date: Thu, 26 Nov 2009 11:36:54 +0300
Message-ID: <200911261136.55300.lav@altlinux.ru> (raw)
In-Reply-To: <4B0E3858.8070201@mmedia2.kemsu.ru>
On 26 ноября 2009, REAL wrote:
> Vitaly Lipatov пишет:
> > 2009-Nov-25 04:29:55 :: error: wine-vanilla.git tag
> > `1.1.33-alt1' is not inherited from
> > /gears/w/wine-vanilla.git branch `sisyphus'
> > 2009-Nov-25 04:29:55 :: gears inheritance check FAILED
> > 2009-Nov-25 04:29:55 :: task #16540 for sisyphus FAILED
>
> Я в таких случаях обычно поступаю так:
>
> git remote add gears git.alt:/gears/w/wine-vanilla.git
> git remote update
> git checkout master [или какой там бранч используете]
> git merge gears/sisyphus
Эти репозитории ничего общего не имеют, там совершенно разные
уровни каталогов, и никакой merge не пройдёт.
--
С уважением,
Виталий Липатов
Санкт-Петербург
GNU! ALT Linux Team! WINE! LaTeX! LyX! http://freesource.info
next prev parent reply other threads:[~2009-11-26 8:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-11 21:37 Vitaly Lipatov
2009-11-11 22:19 ` Dmitry V. Levin
2009-11-26 7:51 ` Vitaly Lipatov
2009-11-26 8:12 ` REAL
2009-11-26 8:36 ` Vitaly Lipatov [this message]
2009-11-26 9:07 ` REAL
2009-11-12 0:38 ` Денис Смирнов
2009-11-12 4:30 ` REAL
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=200911261136.55300.lav@altlinux.ru \
--to=lav@altlinux.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