From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <asy@altlinux.ru>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
 sa.local.altlinux.org
X-Spam-Level: *
X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00, DNS_FROM_AHBL_RHSBL, 
 FUZZY_XPILL,
 RCVD_IN_DNSWL_LOW autolearn=no autolearn_force=no version=3.4.0
From: Sergey Afonin <asy@altlinux.ru>
To: devel@lists.altlinux.org
Date: Tue, 8 Sep 2015 10:58:36 +0400
User-Agent: KMail/1.9.10 (enterprise35 0.20100827.1168748)
MIME-Version: 1.0
Content-Type: text/plain;
  charset="koi8-r"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Message-Id: <201509081058.36821.asy@altlinux.ru>
Subject: [devel] =?koi8-r?b?R2l0OiDLwcsg0NLB18nM2M7PIMnawsHXydTY09Egz9Qg?=
 =?koi8-r?b?0MHU3sEg1yDXycTFIMLSwc7ewSA/?=
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: ALT Linux Team development discussions <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/devel>,
 <mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
 <mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Sep 2015 06:58:47 -0000
Archived-At: <http://lore.altlinux.org/devel/201509081058.36821.asy@altlinux.ru/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

Приветствую.

В некоторых репозитариях патчи оформлены в виде отдельных
бранчей. Например, 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,
что, в общем-то, понятно.

Вопрос: есть ли какой-то способ удалить бранч просто, или надо,
действительно, конфликт руками разбирать ?

-- 
С уважением, Сергей Афонин.