From: Sergey Afonin <asy@altlinux.ru>
To: devel@lists.altlinux.org
Subject: [devel] Git: как правильно избавиться от патча в виде бранча ?
Date: Tue, 8 Sep 2015 10:58:36 +0400
Message-ID: <201509081058.36821.asy@altlinux.ru> (raw)
Приветствую.
В некоторых репозитариях патчи оформлены в виде отдельных
бранчей. Например, Cyrus-IMAP:
* master
patches/alt/003-cyradm
patches/alt/004-configs
patches/alt/011-rehash_fix_pathes
patches/alt/012-getline
patches/debian/007-fix_docs
patches/debian/008-clean_socket_closes
patches/debian/010-update_perlcalling.sh
patches/other/001-flock
patches/other/005-autocreate
upstream
Пришло время избавиться от "patches/other/005-autocreate".
Он мерджится в patches/debian/007-fix_docs (.gear/merge):
merge: upstream patches/other/001-flock
merge: patches/other/001-flock patches/alt/003-cyradm
merge: patches/alt/003-cyradm patches/alt/004-configs
merge: patches/alt/004-configs patches/other/005-autocreate
merge: patches/other/005-autocreate patches/debian/007-fix_docs
merge: patches/debian/007-fix_docs patches/debian/008-clean_socket_closes
merge: patches/debian/008-clean_socket_closes patches/debian/010-update_perlcalling.sh
merge: patches/debian/010-update_perlcalling.sh patches/alt/011-rehash_fix_pathes
merge: patches/alt/011-rehash_fix_pathes patches/alt/012-getline
merge: patches/alt/012-getline master
Попытка его пропустить приводит к лишним конфликтам при попытке
смерджить patches/alt/004-configs напрямую в patches/debian/007-fix_docs,
что, в общем-то, понятно.
Вопрос: есть ли какой-то способ удалить бранч просто, или надо,
действительно, конфликт руками разбирать ?
--
С уважением, Сергей Афонин.
next reply other threads:[~2015-09-08 6:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-08 6:58 Sergey Afonin [this message]
2015-09-08 12:15 ` Sergey Afonin
2015-09-11 11:50 ` Aleksey Avdeev
2015-09-22 7:08 ` Sergey Afonin
2015-09-22 10:12 ` Aleksey Avdeev
2015-10-13 13:47 ` Sergey Afonin
2015-09-22 10:39 ` Michael Shigorin
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=201509081058.36821.asy@altlinux.ru \
--to=asy@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