From: Linus Torvalds <torvalds@linux-foundation.org>
To: Pete/Piet Delaney <pete@bluelane.com>
Cc: VMiklos <vmiklos@frugalware.org>,
free cycle <freecycler23@yahoo.com>,
git@vger.kernel.org
Subject: Re: How to Import a bitkeeper repo into git
Date: Mon, 15 Oct 2007 17:45:44 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.0.999.0710151711280.6887@woody.linux-foundation.org> (raw)
In-Reply-To: <4713FA4A.5090501@bluelane.com>
On Mon, 15 Oct 2007, Pete/Piet Delaney wrote:
>
> I imported the CVS repository to git and it worked great. Since all
> of our other repository are in bitkeeper the management would like to
> stick with CVS. With git apparently still being weak in the area of
> supporting difftool on different version that seems somewhat reasonable
> for the time being.
I can't see how bk's difftool could possibly have any relevance to the
"reasonable to stick with CVS" decision, but hey, I'm always surprised by
peoples inventiveness in rationalizing their decisions ;)
I don't know what difftool does that a simple
git diff -U99 | viewdiff -
wouldn't do, but in all honesty, I don't think I ever used difftool (I
found the other tools in bk much more useful - eg mergetool, renametool)
I don't actually know of any sane programs to view unified diffs, but you
can script one with little trouble. Here's a really hacky one I just came
up with:
#!/bin/sh
cat "$@" > /tmp/diff
grep '^[ -]' /tmp/diff > /tmp/orig
grep '^[ +]' /tmp/diff > /tmp/result
meld /tmp/orig /tmp/result
which fools 'meld' into showing a unified diff in a nice graphical manner.
[ Quite frankly, I don't understand why tools like meld and kdiff3 can't
just take the unified diff directly - they have *all* the logic, it
should be trivial to do, and very useful to view diffs for those people
who like that graphical bling. ]
> The folks at bitmover are converting you kernels to bk and it's
> maintaining the branch history and I'd like to do the same. So far
> they haven't help us convert the git repository to bk. Do you happen
> to know of someone else that might now how to do this in case the
> folks at bitmover can't provide the scripts to convert this git
> repository to bk?
Hmm. Converting from git to bk should not be that hard at least
conceptually, but no, I have no idea how to script it sanely and
efficiently. The obvious solutions all would want to have multiple active
heads of development open at the same time (Larry calls them "LOD's" not
branches), and would also require some way to set the result of a merge.
Neither of which I would know how to do in BK (I created a lot of merges
in BK, but I always let BK do the merging - I wouldn't know how to specify
the merge result by hand).
Linus
next prev parent reply other threads:[~2007-10-16 0:46 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-09 16:57 How to Import a bitkeeper repo into git free cycle
2007-07-09 17:37 ` VMiklos
2007-07-09 17:51 ` Linus Torvalds
2007-10-15 23:39 ` Pete/Piet Delaney
2007-10-16 0:03 ` Shawn O. Pearce
2007-10-16 0:41 ` Pete/Piet Delaney
2007-10-16 1:13 ` David Brown
2007-10-16 0:45 ` Linus Torvalds [this message]
2007-10-16 1:12 ` David Brown
2007-10-16 1:22 ` Linus Torvalds
2007-10-16 3:45 ` Pete/Piet Delaney
2007-10-16 4:56 ` Marco Costalba
2007-10-16 6:05 ` Pete/Piet Delaney
2007-10-16 9:11 ` Marco Costalba
2007-10-16 17:05 ` Andreas Ericsson
2007-10-17 6:57 ` Marco Costalba
2007-10-17 15:50 ` Andreas Ericsson
2007-10-17 5:22 ` Pete/Piet Delaney
2007-10-17 7:14 ` Marco Costalba
2007-10-17 21:47 ` Pete/Piet Delaney
2007-10-17 5:02 ` How to Import a bitkeeper repo into git - Had a few questions on Qgit; I like the GUI Pete/Piet Delaney
2007-10-17 7:30 ` Marco Costalba
2007-10-17 16:00 ` Robin Rosenberg
2007-10-17 23:26 ` Marco Costalba
2007-10-18 21:12 ` Robin Rosenberg
2007-10-18 23:41 ` Qgit performance and maintain CVS environment with GIT repository Pete/Piet Delaney
2007-10-19 0:00 ` Johannes Schindelin
2007-10-19 0:22 ` Pete/Piet Delaney
2007-10-19 0:41 ` Jeff King
2007-10-19 0:50 ` Johannes Schindelin
2007-10-19 7:43 ` Jan Wielemaker
2007-10-19 8:58 ` Pete/Piet Delaney
2007-10-19 10:34 ` Jan Wielemaker
2007-10-19 7:14 ` Andreas Ericsson
2007-10-19 9:12 ` Pete/Piet Delaney
2007-10-19 9:52 ` Andreas Ericsson
2007-10-16 19:15 ` How to Import a bitkeeper repo into git Jan Hudec
2007-10-16 19:28 ` Linus Torvalds
[not found] ` <Pine.LNX.4.64.0710160100510.25221@racer.site>
[not found] ` <47140A5F.7000309@bluelane.com>
[not found] ` <Pine.LNX.4.64.0710160201220.25221@racer.site>
[not found] ` <4714130F.7030809@bluelane.com>
[not found] ` <Pine.LNX.4.64.0710160231040.25221@racer.site>
[not found] ` <47142AF3.1030405@bluelane.com>
[not found] ` <Pine.LNX.4.64.0710161154340.25221@racer.site>
[not found] ` <47303826.1000506@bluelane.com>
2007-11-06 10:51 ` git push problem - unpack unpacker exited with error code; ng refs/heads/rel2_branch n/a (unpacker error) Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.0.999.0710151711280.6887@woody.linux-foundation.org \
--to=torvalds@linux-foundation.org \
--cc=freecycler23@yahoo.com \
--cc=git@vger.kernel.org \
--cc=pete@bluelane.com \
--cc=vmiklos@frugalware.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).