From: "Slava Semushin" <slava.semushin@gmail.com>
To: "ALT Devel discussion list" <devel@lists.altlinux.org>
Subject: Re: [devel] средства импорта проекта в git из тарболлов
Date: Sun, 10 Jun 2007 16:12:56 +0700
Message-ID: <75e139a00706100212t561494deq6d6908abb5aa44f8@mail.gmail.com> (raw)
In-Reply-To: <466A72F7.80305@stc.donpac.ru>
2007/6/9, Eugene Prokopiev <prokopiev / stc.donpac.ru>:
[...]
> > Попробуй gear-update.
>
> $ gear-update -f -v ~/callweaver-1.1.99.20070609.tar.gz callweaver/
> error: 'callweaver/AUTHORS' has local modifications (hint: try -f)
> ...
> error: 'callweaver/utils/streamplayer.c' has local modifications (hint:
> try -f)
Я бы попробовал так:
$ PAGER=cat git diff >back.diff
$ PAGER=cat git diff | patch -p1 -R
$ gear-update -f -v ~/callweaver-1.1.99.20070609.tar.gz callweaver/
$ patch -p1 <back.diff
$ rm -f back.diff
Но, скорее всего это не самое лучшее решение.
--
+ Slava Semushin | slava.semushin @ gmail.com
+ ALT Linux Team | php-coder @ altlinux.ru
next prev parent reply other threads:[~2007-06-10 9:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-09 9:09 Eugene Prokopiev
2007-06-09 9:17 ` Damir Shayhutdinov
2007-06-09 9:29 ` Eugene Prokopiev
2007-06-10 9:12 ` Slava Semushin [this message]
2007-06-10 9:56 ` Alexey Tourbin
2007-06-10 10:03 ` Slava Semushin
2007-06-10 11:20 ` Alexey Tourbin
2007-06-10 11:21 ` Alexey Tourbin
2007-06-10 11:25 ` Slava Semushin
2007-06-10 16:31 ` Eugene Prokopiev
2007-06-10 17:19 ` Sergey Vlasov
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=75e139a00706100212t561494deq6d6908abb5aa44f8@mail.gmail.com \
--to=slava.semushin@gmail.com \
--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