linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: James Bottomley <James.Bottomley@SteelEye.com>
To: Larry McVoy <lm@bitmover.com>
Cc: linux-kernel@vger.kernel.org, James.Bottomley@SteelEye.com
Subject: Re: Changelogs on kernel.org
Date: Wed, 15 May 2002 17:38:21 -0400	[thread overview]
Message-ID: <200205152138.g4FLcLb04842@localhost.localdomain> (raw)

[-- Attachment #1: Type: text/plain, Size: 1024 bytes --]

lm@bitmover.com said:
> We've already built all the interfaces you need to do this, so would
> you be interested in writing the shell script that does it?  The
> interfaces you will want:

>         bk export -tpatch
>         bk import -tpatch
>         bk comments
>         bk changes -v

> You'll want this, I believe that you can take the output of this
> command and feed it into bk comments and have that be a noop.  If that
> works, this is what you need to save as the comments part of the
> patch, and now it's pretty trivial to move the patch backwards.

I've got a shell script which does this (I use it to take test patches from my 
build tree back to a pristine source for submission to linus).  I'm afraid 
it's a bit rough and ready, but it takes a given set of changes, wraps them up 
as patches, extracts the comments and applies them as patches to a different 
tree and then inserts the comments.  I wrote it a while ago, so it may be a 
little dusty and lacking in the newer bitkeeper features.

James



[-- Attachment #2: bkexport --]
[-- Type: text/plain , Size: 1347 bytes --]

#!/bin/bash
#
##
# Author: James Bottomley
##
# Tool to backport from bitkeeper repositories
##
# $Id: bkexport,v 1.1 2002/03/16 15:50:50 jejb Exp $
##

usage() {
    echo "Usage: $0 {-C <change set list>|-R <repository>} <other repository>";
    exit 1;
}

tmp=/tmp/$$
tmpdiff=$tmp.diff
tmpfile=$tmp.file

if [ $# -ne 3 ]; then
    usage;
fi

case $1 in
    -C)		changeset=$2
		dir=$3;;

    -R)		changeset=`bk changes -d':REV:\n' -L $2|sort -n`
		dir=$3;;

    *)		usage;;
esac

if [ ! -d $dir ]; then
    echo "DIRECTORY $dir MUST EXIST" 2>&1
    exit 1;
fi

# get the changes

for c in $changeset; do
    echo "Applying ChangeSet $c"
    bk export -tpatch -du -r$c > $tmpdiff
    pushd $dir > /dev/null
    bk get -e `awk '/^diff/{print substr($3,3)}' < $tmpdiff`
    patch -p1 < $tmpdiff
    popd > /dev/null
    bk changes -v -n -d':GFILE: :REV:' -r$c | {
    while read file rev; do
	if [ "$file" = "ChangeSet" ]; then
	    continue
	fi
	echo "Applying change log for $file revision $rev"
	bk prs -h -d'$each(:C:){(:C:)\n}' -r$rev $file > $tmpfile
	pushd $dir > /dev/null
	bk ci -y"`cat $tmpfile`" $file
	popd > /dev/null
    done
    bk prs -h -d'$each(:C:){(:C:)\n}' -r$c ChangeSet > $tmpfile
    pushd $dir > /dev/null
    echo "Commiting ChangeSet $c"
    bk commit -d -Y$tmpfile
    popd > /dev/null
    }
done
rm -f $tmpdiff $tmpfile

             reply	other threads:[~2002-05-15 21:38 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-05-15 21:38 James Bottomley [this message]
     [not found] <30386.1021456050@redhat.com>
2002-05-15 16:39 ` Changelogs on kernel.org Linus Torvalds
2002-05-15 18:07   ` David Woodhouse
2002-05-15 19:20   ` Larry McVoy
2002-05-15 20:03     ` David Woodhouse
2002-05-15 20:08       ` Larry McVoy
2002-05-15 20:15         ` David Woodhouse
2002-05-15 20:34           ` Larry McVoy
2002-05-15 21:03           ` Kenneth Johansson
2002-05-15 22:30             ` Larry McVoy
2002-05-15 22:56               ` Kai Germaschewski
2002-05-15 22:59                 ` Larry McVoy
2002-05-16  2:26                   ` Horst von Brand
2002-05-16  7:02           ` Rusty Russell
  -- strict thread matches above, loose matches on Subject: below --
2002-05-12  0:07 Ian Molton
2002-05-12  0:48 ` Diego Calleja
2002-05-12  1:09 ` john slee
2002-05-12  1:14   ` john slee
2002-05-12  5:05   ` Brian C. Huffman
2002-05-12 10:05     ` Johnny Mnemonic
2002-05-13  0:46       ` Rik van Riel
2002-05-13 11:52         ` Marcus Alanen
2002-05-13 12:09           ` Tomas Szepe
2002-05-13 13:08             ` Marcus Alanen
2002-05-13 14:08               ` Tomas Szepe
2002-05-13 14:45                 ` Tomas Szepe
2002-05-13 14:06                   ` Greg KH
2002-05-13 15:11                     ` Tomas Szepe
2002-05-13 14:51                       ` Greg KH
2002-05-13 15:58                         ` Matthias Andree
2002-05-13 15:21                     ` Matthias Andree
2002-05-13 22:05                   ` Robinson Maureira Castillo
2002-05-13 23:41                     ` Tomas Szepe
2002-05-14  8:44                       ` Matthias Andree
2002-05-14  8:43                     ` Matthias Andree
2002-05-14  9:23                       ` Tomas Szepe
2002-05-13 11:58         ` Tomas Szepe
2002-05-13 12:39           ` Dave Gilbert (Home)
2002-05-13 13:01             ` Russell King
2002-05-13 13:27               ` Tomas Szepe
2002-05-13 13:42                 ` Russell King
2002-05-13 15:12                 ` Larry McVoy
2002-05-13 15:29                   ` Tomas Szepe
2002-05-13 15:37                     ` Larry McVoy
2002-05-12  9:14   ` Trever L. Adams
2002-05-12 20:06 ` Linus Torvalds
2002-05-12 20:20   ` Jeff Garzik
2002-05-12 20:31   ` Dr. David Alan Gilbert
2002-05-12 20:41     ` Arnaldo Carvalho de Melo
2002-05-13 20:57       ` Linus Torvalds
2002-05-14  0:29         ` Arnaldo Carvalho de Melo
2002-05-13  1:56     ` Linus Torvalds
2002-05-13  9:31       ` Matthias Andree
2002-05-13  8:52         ` Greg KH
2002-05-13 10:41           ` Matthias Andree
2002-05-13 10:12       ` Tomas Szepe
2002-05-13 10:17         ` Tomas Szepe
2002-05-13 13:00         ` Ian Molton
2002-05-12 20:31   ` Matthew D. Pitts
2002-05-12 20:35   ` Anton Altaparmakov
2002-05-12 21:17   ` Florian Weimer
2002-05-12 21:42     ` Marcus Alanen
2002-05-12 22:12       ` Tomas Szepe
2002-05-13 10:32         ` Helge Hafting
2002-05-13  7:34       ` Kristian Peters
2002-05-12 21:51     ` Ian Molton
2002-05-12 21:47       ` Florian Weimer
2002-05-12 23:50         ` Sven.Riedel
2002-05-13  2:01     ` Linus Torvalds
2002-05-13  5:10       ` Jeff Garzik
2002-05-13  5:17         ` Larry McVoy
2002-05-13 10:37         ` Helge Hafting
2002-05-13 19:00           ` Jeff Garzik
2002-05-13  8:57   ` jw schultz
2002-05-13  8:06     ` Greg KH

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=200205152138.g4FLcLb04842@localhost.localdomain \
    --to=james.bottomley@steeleye.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lm@bitmover.com \
    /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;
as well as URLs for NNTP newsgroup(s).