--- tailor1.log	2007-06-17 15:05:15.000000000 +0200
+++ tailor2.log	2007-06-17 15:05:58.000000000 +0200
@@ -9,16 +9,16 @@
 [I] [Ok]
 [I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
 [I] [Ok]
-[I] /tmp/tmp/git $ git update-index --add ./LICENSE ./AUTHORS ./Makefile
+[I] /tmp/tmp/git $ git update-index --add ./AUTHORS ./LICENSE ./Makefile
 [I] [Ok]
-[I] /tmp/tmp/git $ git update-index --add ./var/service ./var/service.pot ./var/service-hu.po ./var/rc.messages ./var/service-de.po
+[I] /tmp/tmp/git $ git update-index --add ./etc/issue.net ./etc/issue.in ./etc/frugalware-release.in ./etc/nsswitch.conf ./etc/ld.so.conf ./etc/securetty ./etc/termcap
 [I] [Ok]
-[I] /tmp/tmp/git $ git update-index --add ./etc/ld.so.conf ./etc/securetty ./etc/issue.in ./etc/nsswitch.conf ./etc/issue.net ./etc/termcap ./etc/frugalware-release.in
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-index --add ./etc/rc.d/rc.frugalware-de.po ./etc/rc.d/rc.frugalware.pot ./etc/rc.d/rc.frugalware ./etc/rc.d/rc.frugalware-hu.po
+[I] /tmp/tmp/git $ git update-index --add ./etc/rc.d/rc.frugalware-de.po ./etc/rc.d/rc.frugalware ./etc/rc.d/rc.frugalware-hu.po ./etc/rc.d/rc.frugalware.pot
 [I] [Ok]
 [I] /tmp/tmp/git $ git update-index --add ./t/test.sh
 [I] [Ok]
+[I] /tmp/tmp/git $ git update-index --add ./var/service-de.po ./var/rc.messages ./var/service ./var/service-hu.po ./var/service.pot
+[I] [Ok]
 [I] /tmp/tmp/git $ git write-tree
 [I] [Ok]
 [I] /tmp/tmp/git $ git rev-parse HEAD
@@ -129,217 +129,9 @@
 [I] /tmp/tmp/git $ git update-ref HEAD a0a1dd8044baeba69aefc9d0a33e25533827c880 96591d5f79ae4727e5c589ad23c8e5fad4096b8e
 [I] [Ok]
 [I] /tmp/tmp/git $ git tag -a -m 0.6rc1 0_6rc1 HEAD
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] Changeset #6
-[I] Changeset "current->pristine"
-[I] /tmp/tmp/darcs $ darcs pull --all --quiet --match "hash 20070207173042-e2957-ce349028f1516247256a484d1e0d9fbdf1bde1c0.gz"
-[I] [Ok]
-[I] /tmp/tmp/darcs $ darcs changes --match "hash 20070207173042-e2957-ce349028f1516247256a484d1e0d9fbdf1bde1c0.gz" --xml-output --summ
-[I] [Ok]
-[I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-index Makefile
-[I] [Ok]
-[I] /tmp/tmp/git $ git write-tree
-[I] [Ok]
-[I] /tmp/tmp/git $ git rev-parse HEAD
-[I] [Ok]
-[I] /tmp/tmp/git $ git commit-tree 1b02e0036c02d0a2e3ae12d45864f4b313f5573d -p a0a1dd8044baeba69aefc9d0a33e25533827c880
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-ref HEAD 5425e6084de55acc155c537b61406b27f26768d1 a0a1dd8044baeba69aefc9d0a33e25533827c880
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] Changeset #7
-[I] Changeset "update to 0.6rc2"
-[I] /tmp/tmp/darcs $ darcs pull --all --quiet --match "hash 20070305195633-e2957-0bc1da0d94a14b45b190e69bcfe6bae764b678cb.gz"
-[I] [Ok]
-[I] /tmp/tmp/darcs $ darcs changes --match "hash 20070305195633-e2957-0bc1da0d94a14b45b190e69bcfe6bae764b678cb.gz" --xml-output --summ
-[I] [Ok]
-[I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-index Makefile
-[I] [Ok]
-[I] /tmp/tmp/git $ git write-tree
-[I] [Ok]
-[I] /tmp/tmp/git $ git rev-parse HEAD
-[I] [Ok]
-[I] /tmp/tmp/git $ git commit-tree 8f6124e4522904aa72f01d2cae79b70c544e0413 -p 5425e6084de55acc155c537b61406b27f26768d1
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-ref HEAD 8eaeee0469b452562fa4735c24d50043d088e1b6 5425e6084de55acc155c537b61406b27f26768d1
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] Changeset #8
-[I] Changeset "tagged 0.6rc2"
-[I] /tmp/tmp/darcs $ darcs pull --all --quiet --match "hash 20070305200100-e2957-8e20ef0d6c0cc5230e87b5241a6b0e74576ed992.gz"
-[I] [Ok]
-[I] /tmp/tmp/darcs $ darcs changes --match "hash 20070305200100-e2957-8e20ef0d6c0cc5230e87b5241a6b0e74576ed992.gz" --xml-output --summ
-[I] [Ok]
-[I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
-[I] [Ok]
-[I] /tmp/tmp/git $ git write-tree
-[I] [Ok]
-[I] /tmp/tmp/git $ git rev-parse HEAD
-[I] [Ok]
-[I] /tmp/tmp/git $ git commit-tree 8f6124e4522904aa72f01d2cae79b70c544e0413 -p 8eaeee0469b452562fa4735c24d50043d088e1b6
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-ref HEAD 0eb406bd3c776bbc96158eec1fda2a29e312dd8b 8eaeee0469b452562fa4735c24d50043d088e1b6
-[I] [Ok]
-[I] /tmp/tmp/git $ git tag -a -m 0.6rc2 0_6rc2 HEAD
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] Changeset #9
-[I] Changeset "updates for 0.6"
-[I] /tmp/tmp/darcs $ darcs pull --all --quiet --match "hash 20070317120410-e2957-5ac3c73010e1b20acf5b3705dfe87bce9c41d543.gz"
-[I] [Ok]
-[I] /tmp/tmp/darcs $ darcs changes --match "hash 20070317120410-e2957-5ac3c73010e1b20acf5b3705dfe87bce9c41d543.gz" --xml-output --summ
-[I] [Ok]
-[I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-index Makefile
-[I] [Ok]
-[I] /tmp/tmp/git $ git write-tree
-[I] [Ok]
-[I] /tmp/tmp/git $ git rev-parse HEAD
-[I] [Ok]
-[I] /tmp/tmp/git $ git commit-tree cce11e85542812963c96cdf1d4ad99f58a48459e -p 0eb406bd3c776bbc96158eec1fda2a29e312dd8b
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-ref HEAD 2f0304711ee88dd63dd7b443d656734e9105a972 0eb406bd3c776bbc96158eec1fda2a29e312dd8b
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] Changeset #10
-[I] Changeset "tagged 0.6"
-[I] /tmp/tmp/darcs $ darcs pull --all --quiet --match "hash 20070317120554-e2957-b2c982e704d2aae61a0909a07af229a82056c561.gz"
-[I] [Ok]
-[I] /tmp/tmp/darcs $ darcs changes --match "hash 20070317120554-e2957-b2c982e704d2aae61a0909a07af229a82056c561.gz" --xml-output --summ
-[I] [Ok]
-[I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
-[I] [Ok]
-[I] /tmp/tmp/git $ git write-tree
-[I] [Ok]
-[I] /tmp/tmp/git $ git rev-parse HEAD
-[I] [Ok]
-[I] /tmp/tmp/git $ git commit-tree cce11e85542812963c96cdf1d4ad99f58a48459e -p 2f0304711ee88dd63dd7b443d656734e9105a972
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-ref HEAD e3fb09079bac2ddc85427be19af66a553e43c24c 2f0304711ee88dd63dd7b443d656734e9105a972
-[I] [Ok]
-[I] /tmp/tmp/git $ git tag -a -m 0.6 0_6 HEAD
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] Changeset #11
-[I] Changeset "Makefile: drop /usr/X11, and /var/X11R6"
-[I] /tmp/tmp/darcs $ darcs pull --all --quiet --match "hash 20070403134103-e2957-52d9e2a3aa61910aa24e1c39d615592cda3bbd9b.gz"
-[I] [Ok]
-[I] /tmp/tmp/darcs $ darcs changes --match "hash 20070403134103-e2957-52d9e2a3aa61910aa24e1c39d615592cda3bbd9b.gz" --xml-output --summ
-[I] [Ok]
-[I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-index Makefile
-[I] [Ok]
-[I] /tmp/tmp/git $ git write-tree
-[I] [Ok]
-[I] /tmp/tmp/git $ git rev-parse HEAD
-[I] [Ok]
-[I] /tmp/tmp/git $ git commit-tree 19e0a8ae217583253463a968cc49b59e4f1e3584 -p e3fb09079bac2ddc85427be19af66a553e43c24c
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-ref HEAD f2d69560ded1748aa64d81e80f951b3be0d22472 e3fb09079bac2ddc85427be19af66a553e43c24c
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] Changeset #12
-[I] Changeset "update version and codename"
-[I] /tmp/tmp/darcs $ darcs pull --all --quiet --match "hash 20070403134405-e2957-ad5d573ad230b8573801c113941c0df15488da59.gz"
-[I] [Ok]
-[I] /tmp/tmp/darcs $ darcs changes --match "hash 20070403134405-e2957-ad5d573ad230b8573801c113941c0df15488da59.gz" --xml-output --summ
-[I] [Ok]
-[I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-index Makefile
-[I] [Ok]
-[I] /tmp/tmp/git $ git write-tree
-[I] [Ok]
-[I] /tmp/tmp/git $ git rev-parse HEAD
-[I] [Ok]
-[I] /tmp/tmp/git $ git commit-tree c1233a290e1ae40e707d398df1c4993b465658a9 -p f2d69560ded1748aa64d81e80f951b3be0d22472
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-ref HEAD 9ceaaa359c8f3e5488ceae13ea8ecb0dadeb78bc f2d69560ded1748aa64d81e80f951b3be0d22472
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] Changeset #13
-[I] Changeset "tagged 0.7pre1"
-[I] /tmp/tmp/darcs $ darcs pull --all --quiet --match "hash 20070403134453-e2957-fdbae81f82d3a7360c48ef954e713682565bebb8.gz"
-[I] [Ok]
-[I] /tmp/tmp/darcs $ darcs changes --match "hash 20070403134453-e2957-fdbae81f82d3a7360c48ef954e713682565bebb8.gz" --xml-output --summ
-[I] [Ok]
-[I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
-[I] [Ok]
-[I] /tmp/tmp/git $ git write-tree
-[I] [Ok]
-[I] /tmp/tmp/git $ git rev-parse HEAD
-[I] [Ok]
-[I] /tmp/tmp/git $ git commit-tree c1233a290e1ae40e707d398df1c4993b465658a9 -p 9ceaaa359c8f3e5488ceae13ea8ecb0dadeb78bc
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-ref HEAD f74335aad82fb435c491ae5085834ba394f16a45 9ceaaa359c8f3e5488ceae13ea8ecb0dadeb78bc
-[I] [Ok]
-[I] /tmp/tmp/git $ git tag -a -m 0.7pre1 0_7pre1 HEAD
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] Changeset #14
-[I] Changeset "ld.so.conf: remove X11R6"
-[I] /tmp/tmp/darcs $ darcs pull --all --quiet --match "hash 20070408203256-e2957-d65645b55f6582fc06c7ae7de34da5b3702a06fc.gz"
-[I] [Ok]
-[I] /tmp/tmp/darcs $ darcs changes --match "hash 20070408203256-e2957-d65645b55f6582fc06c7ae7de34da5b3702a06fc.gz" --xml-output --summ
-[I] [Ok]
-[I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-index etc/ld.so.conf
-[I] [Ok]
-[I] /tmp/tmp/git $ git write-tree
-[I] [Ok]
-[I] /tmp/tmp/git $ git rev-parse HEAD
-[I] [Ok]
-[I] /tmp/tmp/git $ git commit-tree 92ac47af3b7798ea4893449f188fae9d2bb7bbab -p f74335aad82fb435c491ae5085834ba394f16a45
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-ref HEAD 3484f0a01dde3e91c9b98ee8ba99901ab07c0564 f74335aad82fb435c491ae5085834ba394f16a45
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] Changeset #15
-[I] Changeset "var/service: implement --version and --help options"
-[I] /tmp/tmp/darcs $ darcs pull --all --quiet --match "hash 20070412163108-e2957-fbc2d2739dffcafdcc7a67ee2b98d247178a170f.gz"
-[I] [Ok]
-[I] /tmp/tmp/darcs $ darcs changes --match "hash 20070412163108-e2957-fbc2d2739dffcafdcc7a67ee2b98d247178a170f.gz" --xml-output --summ
-[I] [Ok]
-[I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-index var/service
-[I] [Ok]
-[I] /tmp/tmp/git $ git write-tree
-[I] [Ok]
-[I] /tmp/tmp/git $ git rev-parse HEAD
-[I] [Ok]
-[I] /tmp/tmp/git $ git commit-tree 429ccee7c98cf710e6b8a91f1c46e08e904931ae -p 3484f0a01dde3e91c9b98ee8ba99901ab07c0564
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-ref HEAD 789de7abacdf1e7e147fd57b873965e5827da5f7 3484f0a01dde3e91c9b98ee8ba99901ab07c0564
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] Changeset #16
-[I] Changeset "add a simple manpage for service"
-[I] /tmp/tmp/darcs $ darcs pull --all --quiet --match "hash 20070412163649-e2957-aaca88030f1556d8c066c02f25160d03e19e987c.gz"
-[I] [Ok]
-[I] /tmp/tmp/darcs $ darcs changes --match "hash 20070412163649-e2957-aaca88030f1556d8c066c02f25160d03e19e987c.gz" --xml-output --summ
-[I] [Ok]
-[I] $ rsync --archive --exclude _darcs --exclude .git /tmp/tmp/darcs/ /tmp/tmp/git
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-index Makefile var/service
-[I] [Ok]
-[I] /tmp/tmp/git $ git write-tree
-[I] [Ok]
-[I] /tmp/tmp/git $ git rev-parse HEAD
-[I] [Ok]
-[I] /tmp/tmp/git $ git commit-tree c640b53c8d06b5846ecc9c1c545dcd5b54ec4972 -p 789de7abacdf1e7e147fd57b873965e5827da5f7
-[I] [Ok]
-[I] /tmp/tmp/git $ git update-ref HEAD f628d734fbd44a031229b09eef0b821bedd1489e 789de7abacdf1e7e147fd57b873965e5827da5f7
-[I] [Ok]
-[I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-[I] 0 pending changesets in state file
-[I] Update completed, now at revision "add a simple manpage for service"
-Initialized empty Git repository in /home/vmiklos/scm/git/frugalware/.git/
+[W] [Status 1]
+[C] Couldn't replay changeset
+[I] 12 pending changesets in state file
+[C] Upstream change application failed
+Failure applying upstream changes: /tmp/tmp/git $ git tag -a -m 0.6rc1 0_6rc1 HEAD returned status 1
+pendings changesets != 0 (12), convert failed