From: Alexey Tourbin <at@altlinux.ru>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] как держать backports в git
Date: Thu, 25 Sep 2008 06:27:09 +0000
Message-ID: <20080925062709.GV839@altlinux.org> (raw)
In-Reply-To: <774a4f4a0809242247g27d2bd86u79b1771b4047688c@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1407 bytes --]
On Thu, Sep 25, 2008 at 08:47:27AM +0300, Artem Zolochevskiy wrote:
> Как мне теперь делать backport версии 3.0-alt1?
> git-pull . tag 3.0-alt1
> (или git-merge master или git-merge 3.0-alt1)
> получил конфликты.
> У меня получилось что-то вроде
> <<<<<<< HEAD:example.spec
> Version: 2.0
> Release: alt0.M41.1
> =======
> Version: 3.0
> Release: alt1
> >>>>>>>f6aa1fa14e5329d1490b5c0c88526e1e4759a309:example.spec
Разрешить конфликт следущим образом:
Version: 3.0
Release: alt0.M41.1
> <<<<<<< HEAD:example.spec
> * Thu Sep 25 2008 Artem Zolochevskiy <azol@altlinux.ru> 2.0-alt0.M41.1
> - build for 4.1 branch (2.0-alt1)
> =======
> * Thu Sep 25 2008 Artem Zolochevskiy <azol@altlinux.ru> 3.0-alt1
> - version 3.0
> >>>>>>> f6aa1fa14e5329d1490b5c0c88526e1e4759a309:example.spec
Разрешить конфликт следущим образом (сохранив все старые записи
в changelog'е, а также добавив новую, соответствующую бекпорту):
* Thu Sep 25 2008 Artem Zolochevskiy <azol@altlinux.ru> 3.0-alt0.M41.1
- build for 4.1 branch
* Thu Sep 25 2008 Artem Zolochevskiy <azol@altlinux.ru> 3.0-alt1
- version 3.0
* Thu Sep 25 2008 Artem Zolochevskiy <azol@altlinux.ru> 2.0-alt0.M41.1
- build for 4.1 branch (2.0-alt1)
После этого сделать единый merge commit:
gear-commit -a
То есть история будет такой:
* [altlinux-4.1] 3.0-alt0.M41.1
|`* [master] 3.0-alt1
* | 2.0-alt0.M41.1
`* 2.0-alt1
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-09-25 6:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-25 5:47 Artem Zolochevskiy
2008-09-25 5:53 ` Alexey Tourbin
2008-09-25 5:56 ` Artem Zolochevskiy
2008-09-25 6:01 ` Slava Semushin
2008-09-25 6:07 ` Artem Zolochevskiy
2008-09-25 6:27 ` Alexey Tourbin [this message]
2008-09-25 6:37 ` Artem Zolochevskiy
2008-09-25 6:46 ` Alexey Tourbin
2008-09-25 7:51 ` Alexey Borovskoy
2008-09-25 8:07 ` Artem Zolochevskiy
2008-09-26 6:46 ` Eugene Prokopiev
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=20080925062709.GV839@altlinux.org \
--to=at@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