From: "Justin T. Gibbs" <gibbs@scsiguy.com>
To: linux-kernel <linux-kernel@vger.kernel.org>
Subject: Looking for some BK assistance
Date: Thu, 15 May 2003 14:13:53 -0600 [thread overview]
Message-ID: <267360000.1053029633@aslan.btc.adaptec.com> (raw)
I'm trying to merge my 2.4.X BK tree with Marcelo's tree. In the end,
I want to have a tree that I can "bk send" to Marcelo that backs out
the recent backout of the aic7xxx driver and puts the aic79xx driver
back into its original location. I understand how to override incoming
content changes during the merge process, but the documentation on
undoing renames is a bit vague. During the merge process, my local
file name is already a deleted name that is slightly different than
the name in the parent repository. If I try to resolve the rename by
putting the file back into its original location, BK complains that that
name already exists. The documentation also warns that renames should
only be performed in the master repository. Can someone with BK clue
point me in the right direction on this one?
Thanks,
Justin
reply other threads:[~2003-05-15 20:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=267360000.1053029633@aslan.btc.adaptec.com \
--to=gibbs@scsiguy.com \
--cc=linux-kernel@vger.kernel.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome