[Kde-scm-interest] kdelibs no-branch import finished

Thiago Macieira thiago at kde.org
Thu Dec 27 17:52:18 CET 2007


Thiago Macieira wrote:
>$ git cat-file -p HEAD
>tree 9fc2d64f105c8336e6baece6a72989257c5d7f68
>parent 7c75bce170ea39b52434ea0572ddd5c759367675
>author ossi <ossi at localhost> 1198356638 -0000
>committer ossi <ossi at localhost> 1198356638 -0000
>
>- don't get confused by one-letter keys, trailing spaces on keys,
>  mismatched brackets, ...
>- minor optimizations (moved some conditions, removed pointless ones)
>
>svn path=/trunk/KDE/kdelibs/; revision=751804

But it doesn't match an SVN export:

$ svn export -r 751804 svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdelibs
[a few minutes later]

$ cd kdelibs
$ git init; git add .; git commit -m "Test import" -a
[a few seconds later]
$ git cat-file -p HEAD
tree fcece175e6d9f49af740240f52746290873d0b4b
author Thiago Macieira <thiago.macieira at trolltech.com> 1198773294 +0100
committer Thiago Macieira <thiago.macieira at trolltech.com> 1198773294 +0100

Test import


All files are there:
$ diff -u <(git ls-tree --name-only -r HEAD) <(cd /mnt/kderepo/kdelibs; 
git ls-tree --name-only -r HEAD) | wc -l
0

All files have the proper modes:
$ diff -u <(git ls-tree -r HEAD| awk '{print $1, $2, $4}') 
<(cd /mnt/kderepo/kdelibs; git ls-tree -r HEAD| awk '{print $1, $2, 
$4}') | wc -l
0

But 85 files differ in size and contents:
[result attached]

Taking one example to see why:
$ diff -u 
kdoctools/customization/xsl/sl.xml /mnt/kderepo/kdelibs/kdoctools/customization/xsl/sl.xml
--- kdoctools/customization/xsl/sl.xml  2001-05-19 23:03:44.000000000 
+0200
+++ /mnt/kderepo/kdelibs/kdoctools/customization/xsl/sl.xml    2007-12-27 
17:49:02.319545740 +0100
@@ -1,5 +1,5 @@
 <localization language="sl">
-<!-- $Id: sl.xml 97869 2001-05-19 21:03:44Z romanm $ -->
+<!-- $Id$ -->
 <!-- $Source$ -->
 <!-- Notes for translators:
  1. Do not translate `&...;' (unless you know the mechanism).

A-ha! Keywords!

-- 
  Thiago Macieira  -  thiago (AT) macieira.info - thiago (AT) kde.org
    PGP/GPG: 0x6EF45358; fingerprint:
    E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
$ sdiff -s <(git ls-tree -l -r HEAD| awk '{print $4, $5}') <(cd /mnt/kderepo/kdelibs; git ls-tree -l -r HEAD| awk '{print $4, $5}')
24284 kded/kded.cpp                                           | 24238 kded/kded.cpp
907 kdoctools/customization/xsl/sl.xml                        | 864 kdoctools/customization/xsl/sl.xml
8347 kdoctools/docbook/xml-dtd-4.1.2/calstblx.dtd             | 8299 kdoctools/docbook/xml-dtd-4.1.2/calstblx.dtd
6263 kdoctools/docbook/xml-dtd-4.1.2/dbcentx.mod              | 6216 kdoctools/docbook/xml-dtd-4.1.2/dbcentx.mod
59183 kdoctools/docbook/xml-dtd-4.1.2/dbhierx.mod             | 59136 kdoctools/docbook/xml-dtd-4.1.2/dbhierx.mod
4311 kdoctools/docbook/xml-dtd-4.1.2/dbnotnx.mod              | 4264 kdoctools/docbook/xml-dtd-4.1.2/dbnotnx.mod
203333 kdoctools/docbook/xml-dtd-4.1.2/dbpoolx.mod            | 203286 kdoctools/docbook/xml-dtd-4.1.2/dbpoolx.mod
4655 kdoctools/docbook/xml-dtd-4.1.2/docbookx.dtd             | 4607 kdoctools/docbook/xml-dtd-4.1.2/docbookx.dtd
8415 kdoctools/docbook/xml-dtd-4.2/calstblx.dtd               | 8365 kdoctools/docbook/xml-dtd-4.2/calstblx.dtd
10176 kdoctools/docbook/xml-dtd-4.2/dbcentx.mod               | 10127 kdoctools/docbook/xml-dtd-4.2/dbcentx.mod
59633 kdoctools/docbook/xml-dtd-4.2/dbhierx.mod               | 59584 kdoctools/docbook/xml-dtd-4.2/dbhierx.mod
4394 kdoctools/docbook/xml-dtd-4.2/dbnotnx.mod                | 4345 kdoctools/docbook/xml-dtd-4.2/dbnotnx.mod
216343 kdoctools/docbook/xml-dtd-4.2/dbpoolx.mod              | 216294 kdoctools/docbook/xml-dtd-4.2/dbpoolx.mod
5702 kdoctools/docbook/xml-dtd-4.2/docbookx.dtd               | 5652 kdoctools/docbook/xml-dtd-4.2/docbookx.dtd
4477 kdoctools/docbook/xsl/README                             | 4434 kdoctools/docbook/xsl/README
26801 kdoctools/docbook/xsl/common/ChangeLog                  | 26755 kdoctools/docbook/xsl/common/ChangeLog
4786 kdoctools/docbook/xsl/common/autoidx-ng.xsl              | 4736 kdoctools/docbook/xsl/common/autoidx-ng.xsl
61646 kdoctools/docbook/xsl/common/common.xsl                 | 61552 kdoctools/docbook/xsl/common/common.xsl
29329 kdoctools/docbook/xsl/common/gentext.xsl                | 29281 kdoctools/docbook/xsl/common/gentext.xsl
16304 kdoctools/docbook/xsl/common/l10n.xsl                   | 16259 kdoctools/docbook/xsl/common/l10n.xsl
23182 kdoctools/docbook/xsl/common/labels.xsl                 | 23135 kdoctools/docbook/xsl/common/labels.xsl
6948 kdoctools/docbook/xsl/common/pi.xsl                      | 6905 kdoctools/docbook/xsl/common/pi.xsl
5806 kdoctools/docbook/xsl/common/subtitles.xsl               | 5756 kdoctools/docbook/xsl/common/subtitles.xsl
16465 kdoctools/docbook/xsl/common/table.xsl                  | 16419 kdoctools/docbook/xsl/common/table.xsl
8129 kdoctools/docbook/xsl/common/targets.xsl                 | 8081 kdoctools/docbook/xsl/common/targets.xsl
23594 kdoctools/docbook/xsl/common/titles.xsl                 | 23547 kdoctools/docbook/xsl/common/titles.xsl
84696 kdoctools/docbook/xsl/html/ChangeLog                    | 84650 kdoctools/docbook/xsl/html/ChangeLog
4267 kdoctools/docbook/xsl/html/admon.xsl                     | 4221 kdoctools/docbook/xsl/html/admon.xsl
3671 kdoctools/docbook/xsl/html/autoidx-ng.xsl                | 3621 kdoctools/docbook/xsl/html/autoidx-ng.xsl
19804 kdoctools/docbook/xsl/html/autoidx.xsl                  | 19756 kdoctools/docbook/xsl/html/autoidx.xsl
20855 kdoctools/docbook/xsl/html/autotoc.xsl                  | 20807 kdoctools/docbook/xsl/html/autotoc.xsl
32874 kdoctools/docbook/xsl/html/biblio.xsl                   | 32827 kdoctools/docbook/xsl/html/biblio.xsl
11528 kdoctools/docbook/xsl/html/block.xsl                    | 11482 kdoctools/docbook/xsl/html/block.xsl
6999 kdoctools/docbook/xsl/html/callout.xsl                   | 6951 kdoctools/docbook/xsl/html/callout.xsl
3484 kdoctools/docbook/xsl/html/changebars.xsl                | 3433 kdoctools/docbook/xsl/html/changebars.xsl
39501 kdoctools/docbook/xsl/html/chunk-code.xsl               | 39450 kdoctools/docbook/xsl/html/chunk-code.xsl
36151 kdoctools/docbook/xsl/html/chunk-common.xsl             | 36098 kdoctools/docbook/xsl/html/chunk-common.xsl
1509 kdoctools/docbook/xsl/html/chunk.xsl                     | 1463 kdoctools/docbook/xsl/html/chunk.xsl
20211 kdoctools/docbook/xsl/html/chunker.xsl                  | 20163 kdoctools/docbook/xsl/html/chunker.xsl
2628 kdoctools/docbook/xsl/html/chunkfast.xsl                 | 2578 kdoctools/docbook/xsl/html/chunkfast.xsl
7307 kdoctools/docbook/xsl/html/chunktoc.xsl                  | 7258 kdoctools/docbook/xsl/html/chunktoc.xsl
14655 kdoctools/docbook/xsl/html/component.xsl                | 14605 kdoctools/docbook/xsl/html/component.xsl
5697 kdoctools/docbook/xsl/html/division.xsl                  | 5648 kdoctools/docbook/xsl/html/division.xsl
15024 kdoctools/docbook/xsl/html/docbook.xsl                  | 14976 kdoctools/docbook/xsl/html/docbook.xsl
9625 kdoctools/docbook/xsl/html/ebnf.xsl                      | 9535 kdoctools/docbook/xsl/html/ebnf.xsl
8639 kdoctools/docbook/xsl/html/footnote.xsl                  | 8590 kdoctools/docbook/xsl/html/footnote.xsl
11292 kdoctools/docbook/xsl/html/formal.xsl                   | 11245 kdoctools/docbook/xsl/html/formal.xsl
11503 kdoctools/docbook/xsl/html/glossary.xsl                 | 11454 kdoctools/docbook/xsl/html/glossary.xsl
43057 kdoctools/docbook/xsl/html/graphics.xsl                 | 43008 kdoctools/docbook/xsl/html/graphics.xsl
11439 kdoctools/docbook/xsl/html/html-rtf.xsl                 | 11390 kdoctools/docbook/xsl/html/html-rtf.xsl
3256 kdoctools/docbook/xsl/html/html.xsl                      | 3211 kdoctools/docbook/xsl/html/html.xsl
1584 kdoctools/docbook/xsl/html/htmltbl.xsl                   | 1536 kdoctools/docbook/xsl/html/htmltbl.xsl
5877 kdoctools/docbook/xsl/html/index.xsl                     | 5831 kdoctools/docbook/xsl/html/index.xsl
1665 kdoctools/docbook/xsl/html/info.xsl                      | 1620 kdoctools/docbook/xsl/html/info.xsl
35509 kdoctools/docbook/xsl/html/inline.xsl                   | 35462 kdoctools/docbook/xsl/html/inline.xsl
1218 kdoctools/docbook/xsl/html/keywords.xsl                  | 1169 kdoctools/docbook/xsl/html/keywords.xsl
34055 kdoctools/docbook/xsl/html/lists.xsl                    | 34009 kdoctools/docbook/xsl/html/lists.xsl
2643 kdoctools/docbook/xsl/html/maketoc.xsl                   | 2595 kdoctools/docbook/xsl/html/maketoc.xsl
4531 kdoctools/docbook/xsl/html/manifest.xsl                  | 4482 kdoctools/docbook/xsl/html/manifest.xsl
8908 kdoctools/docbook/xsl/html/math.xsl                      | 8863 kdoctools/docbook/xsl/html/math.xsl
7558 kdoctools/docbook/xsl/html/oldchunker.xsl                | 7507 kdoctools/docbook/xsl/html/oldchunker.xsl
1445 kdoctools/docbook/xsl/html/onechunk.xsl                  | 1396 kdoctools/docbook/xsl/html/onechunk.xsl
267586 kdoctools/docbook/xsl/html/param.xml                   | 267494 kdoctools/docbook/xsl/html/param.xml
15281 kdoctools/docbook/xsl/html/param.xsl                    | 15235 kdoctools/docbook/xsl/html/param.xsl
23760 kdoctools/docbook/xsl/html/param.xweb                   | 23666 kdoctools/docbook/xsl/html/param.xweb
6838 kdoctools/docbook/xsl/html/pi.xsl                        | 6795 kdoctools/docbook/xsl/html/pi.xsl
39835 kdoctools/docbook/xsl/html/profile-chunk-code.xsl       | 39776 kdoctools/docbook/xsl/html/profile-chunk-code.xsl
1525 kdoctools/docbook/xsl/html/profile-chunk.xsl             | 1471 kdoctools/docbook/xsl/html/profile-chunk.xsl
15633 kdoctools/docbook/xsl/html/profile-docbook.xsl          | 15577 kdoctools/docbook/xsl/html/profile-docbook.xsl
1461 kdoctools/docbook/xsl/html/profile-onechunk.xsl          | 1404 kdoctools/docbook/xsl/html/profile-onechunk.xsl
12045 kdoctools/docbook/xsl/html/qandaset.xsl                 | 11996 kdoctools/docbook/xsl/html/qandaset.xsl
7645 kdoctools/docbook/xsl/html/refentry.xsl                  | 7596 kdoctools/docbook/xsl/html/refentry.xsl
20180 kdoctools/docbook/xsl/html/sections.xsl                 | 20131 kdoctools/docbook/xsl/html/sections.xsl
39473 kdoctools/docbook/xsl/html/synop.xsl                    | 39427 kdoctools/docbook/xsl/html/synop.xsl
39363 kdoctools/docbook/xsl/html/table.xsl                    | 39317 kdoctools/docbook/xsl/html/table.xsl
2164 kdoctools/docbook/xsl/html/task.xsl                      | 2119 kdoctools/docbook/xsl/html/task.xsl
25532 kdoctools/docbook/xsl/html/titlepage.xsl                | 25482 kdoctools/docbook/xsl/html/titlepage.xsl
5564 kdoctools/docbook/xsl/html/toc.xsl                       | 5520 kdoctools/docbook/xsl/html/toc.xsl
12166 kdoctools/docbook/xsl/html/verbatim.xsl                 | 12117 kdoctools/docbook/xsl/html/verbatim.xsl
39625 kdoctools/docbook/xsl/html/xref.xsl                     | 39580 kdoctools/docbook/xsl/html/xref.xsl
29036 kdoctools/docbook/xsl/lib/lib.xml                       | 28948 kdoctools/docbook/xsl/lib/lib.xml
13065 kdoctools/docbook/xsl/lib/lib.xsl                       | 13021 kdoctools/docbook/xsl/lib/lib.xsl
24883 kdoctools/docbook/xsl/lib/lib.xweb                      | 24793 kdoctools/docbook/xsl/lib/lib.xweb
10488 kdoctools/meinproc.cpp                                  | 10479 kdoctools/meinproc.cpp
45266 khtml/html/dtd.dtd                                      | 45219 khtml/html/dtd.dtd
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20071227/34a424cf/attachment-0001.pgp 


More information about the Kde-scm-interest mailing list