Re: 2.5 development

3 messages, 3 authors, 2002-02-15 · open the first message on its own page

Re: 2.5 development

From: Larry McVoy <hidden>
Date: 2002-02-15 16:58:12

On Fri, Feb 15, 2002 at 11:11:57PM +1100, Paul Mackerras wrote:
The current limitations of BK mean that we will not be able to take
changesets directly from the linuxppc-2.5 tree and send them to
Linus.
You can export changes as a patch and import them.  Notice that the new
"bk comments" command will let you change the comments after you do the
import.  To get a changeset's comments in a form that bk comments will
like, try this (requires bk 2.1.4 or later):

bk changes -r+ -vnd'### Change the comments to :GFILE: below\n:C:'

That will do it for the most recent changeset, s/+/rev/ that you used
with the export/import.
--
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: 2.5 development

From: Jeff Garzik <hidden>
Date: 2002-02-15 17:01:06

Larry McVoy wrote:
On Fri, Feb 15, 2002 at 11:11:57PM +1100, Paul Mackerras wrote:
quoted
The current limitations of BK mean that we will not be able to take
changesets directly from the linuxppc-2.5 tree and send them to
Linus.
You can export changes as a patch and import them.  Notice that the new
"bk comments" command will let you change the comments after you do the
import.  To get a changeset's comments in a form that bk comments will
like, try this (requires bk 2.1.4 or later):
FWIW, I prefer to export as a patch, and then 'bk citool' to check in.
If you are going to edit the comments anyway, then re-importing a patch
is best done IMHO with

	patch -sp1 -g1 < ~/tmp/patch
	bk citool

--
Jeff Garzik      | "I went through my candy like hot oatmeal
Building 1024    |  through an internally-buttered weasel."
MandrakeSoft     |             - goats.com

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: 2.5 development

From: Tom Rini <hidden>
Date: 2002-02-15 17:32:10

On Fri, Feb 15, 2002 at 08:58:12AM -0800, Larry McVoy wrote:
On Fri, Feb 15, 2002 at 11:11:57PM +1100, Paul Mackerras wrote:
quoted
The current limitations of BK mean that we will not be able to take
changesets directly from the linuxppc-2.5 tree and send them to
Linus.
You can export changes as a patch and import them.
Which still isn't directly. :)  It will catch most of the problems, but
if you export a patch with new files from one tree, import into another
and pull back into the original, you have a file conflict, yes?

--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help