[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bitkeeper-users
Subject:    [Bitkeeper-users] bk treediff
From:       "Brown, Len" <len.brown () intel ! com>
Date:       2003-07-08 15:13:42
[Download RAW message or body]

Is anybody successfully using "bk treediff/bk import"

When I use it renametool chokes and the newly created files don't get
checked in.

Thanks,
-Len

Details from
http://bitkeeper.bkserver.com/cgi-bin/bugdb.cgi?.page=view;id=2003-06-27-005

This example compares SL8.2's docs directory (g-files only) to those checked
into a stock 2.4.20 tree "merged":

$ bk treediff linux-2.4.20-SuSE-merged/Documentation/
linux-2.4.20-SuSE/Documentation/ >docs.patch
$ bk import -tpatch docs.patch linux-2.4.20-SuSE-merged

Patching...
Patching file Documentation/00-INDEX
...
Patching file Documentation/DocBook/via-audio.tmpl
Creating file Documentation/IPMI.txt
...
Patching file Documentation/x86_64/mm.txt
Checking for potential renames in /home/lenb/src/linux-2.4.20-SuSE-merged
...
Error in startup script: expected integer but got "--4"
    (reading increment)
    invoked from within
"incr gc(rename.listHeight) -$diff"
    (procedure "getFiles" line 34)
    invoked from within
"getFiles"
    (procedure "main" line 23)
    invoked from within
"main"
    (file "/usr/local/bitkeeper/renametool" line 2109)
Creating changeset for docs.patch in /home/lenb/src/linux-2.4.20-SuSE-merged
...

BitKeeper is running a consistency check on your system because it
has noticed that this check has not yet been run on this repository.
This check is a one time event, but takes quite a while on large
repositories (approximately one minute per 1000 files).

Please stand by and let the process finish (i.e. do not kill this process).

Consistency check completed, thanks for waiting.

ChangeSet revision 1.780: +44 -0 = 33927
Sending ChangeSet log ...
Done.

sometime after "Checking for potential renames...
a window momentarily flashed on the screen, and then went away.
I thought it was the lights blinking the 1st time, but it happened when i
repeated this failure too.
lenb@dhcppc6:~/src> cd *merged
lenb@dhcppc6:~/src/linux-2.4.20-SuSE-merged> bk sfiles -x
Documentation/AIO-NOTES
Documentation/IPMI.txt
...

So the newly created files didn't get checked in.

_______________________________________________
Bitkeeper-users mailing list
Bitkeeper-users@bitmover.com
http://bitmover.com/mailman/listinfo/bitkeeper-users
To unsubscribe from this list, go to the above URL, follow instruction at the bottom of the web page.
[prev in list] [next in list] [prev in thread] [next in thread]