Path: csiph.com!optima2.xanadu-bbs.net!xanadu-bbs.net!news.glorb.com!diesel.cu.mi.it!bofh.it!news.nic.it!robomod From: Brian May Newsgroups: linux.debian.maint.python Subject: git-dpm merge conflicts Date: Tue, 20 Oct 2015 04:00:02 +0200 Message-ID: X-Original-To: debian-python@lists.debian.org X-Mailbox-Line: From debian-python-request@lists.debian.org Tue Oct 20 01:55:04 2015 Old-Return-Path: X-Amavis-Spam-Status: No, score=-6.679 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DIGITS_LETTERS=1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.001, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham autolearn_force=no X-Policyd-Weight: DYN_NJABL=SKIP(0) NOT_IN_SBL_XBL_SPAMHAUS=-1.5 BL_NJABL=SKIP(-1.5) CL_IP_EQ_HELO_IP=-2 (check from: .microcomaustralia. - helo: .mail-pa0-x233.google. - helo-domain: .google.) FROM/MX_MATCHES_NOT_HELO(DOMAIN)=0; rate: -5 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microcomaustralia.com.au; s=google; h=sender:from:to:subject:organization:user-agent:date:message-id :mime-version:content-type; bh=dkcAlNAgDD/E7bCCnbXv8vmOx8eiGjUL1g66QaLDgL0=; b=AkhPg9H6jWvH7IBua0+4Yt7PPn+8FQrTPJm99ZRAZE3/dYJEuZGPQbW5iDmkQ28DpL 7dyE+MC7vin6yMDfX5YVq6ag5fcHY6lQOvNKEHh9J6kVBUrllWmMJe5yCYjyHIt6DRmE PF1DkX40EvqFG/8hPcATT0so9gHyLZKnnSU5M= X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:organization:user-agent :date:message-id:mime-version:content-type; bh=dkcAlNAgDD/E7bCCnbXv8vmOx8eiGjUL1g66QaLDgL0=; b=dTctB/kCKtDW6tQbGzXrFmxNCPEMLEw9lBhp/bZimvfxlyNX1DExScyQQGbgyf2m2p Iuos1SMA8Oz4e7eBX7P1Xym939wPDYiUa/XfXkCQZU4RZ9A1bJHCyE4WJBUjbClxDOa6 3U5ywOFMLTsDPKBUMSFLs2dYi323FuDJcE4b0XQXVr59y0xHHWuCKyIeXxOGrBPrlvOT Umo56sGvrn3TaKUka1f92fZL/njvEwt5FNB5+WsxTcxnF1n6IWqFu/pQsBF1LsUfmtzp PkVDzZWNBBHp/YNUutLtPgtvklgR4S/r3SflFsKSDsjyJTTCt6ogFHtGrbfhi/idW6Ex lohw== X-Gm-Message-State: ALoCoQkkn2Tq28slM4YNDvXnTm+6FUASBziWGRd5G08GE3WfPlPkbWaKgDwBl8UvKQ6Ai4+dLC2l X-Received: by 10.67.30.74 with SMTP id kc10mr666624pad.147.1445306086143; Mon, 19 Oct 2015 18:54:46 -0700 (PDT) Sender: robomod@news.nic.it Organization: Debian User-Agent: Notmuch/0.18.2 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Mailing-List: archive/latest/13018 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/87vba2cnj3.fsf@prune.linuxpenguins.xyz Approved: robomod@news.nic.it Lines: 33 X-Original-Date: Tue, 20 Oct 2015 12:54:40 +1100 X-Original-Message-ID: <87vba2cnj3.fsf@prune.linuxpenguins.xyz> X-Original-Sender: Brian May Xref: csiph.com linux.debian.maint.python:7706 Hello, When the following error occurs, how can I tell what patch it was attempting to apply at the time? In this particular case I can guess, however it occurred to me that there had to be a better way... git diff in this case shows upstream changes, not my changes. Possibly because the changes have been applied upstream and the patch is a NOP. Trying to work out what is going on without reference to the original patch is somewhat confusing however. Regards git-dpm import-new-upstream --ptc --rebase-patched ../python-mkdocs_0.14.0.orig.tar.gz Switched to a new branch 'patched' Rebasing changes in 'patched' since '9c3e1c4fe92d2eb23173b4ee88efd8e603d859b9' onto 'upstream'... First, rewinding head to replay your work on top of it... Auto-merging mkdocs/themes/mkdocs/base.html CONFLICT (content): Merge conflict in mkdocs/themes/mkdocs/base.html When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort". Once you finished rebase, don't forget to call update-patches -- Brian May