HellO! On Mon 07 Nov 2005 18:31 +0100, Peter Van Eynde wrote:
On Sunday 06 November 2005 21:03, Luca Capello wrote:
So, as fas as I understood, I can't use dbp-importorig to merge two versions of an upstream program, in this case, release 5 and a CVS checkout. Am I correct?
Not being an expert this is what I have found too.
I think I should file a bug/wishlist for dbp ;-)
To resolve this I would extract the new files over the existing darcs s-xml-upstream tree and then use darcs mv and record directly.
I found another solution, maybe simpler (s-xml.tar.gz is the CVS downloaded via ViewCVS): ===== luca@gismo:~/Downloads$ tar zxvf s-xml.tar.gz <cut> luca@gismo:~/Downloads$ cp -rp \ /home/luca/Hacking/cl-debian/repository/s-xml-upstream/doc/ s-xml/ luca@gismo:~/Downloads$ dbp-importorig s-xml/ s-xml 1:20051107 TLACMD: darcs tar: ./src: implausibly old time stamp 1970-01-01 01:00:00 tar: ./test: implausibly old time stamp 1970-01-01 01:00:00 LOGTEXT Imported s-xml into Darcs repository Finished recording patch 'Import upstream s-xml version 1:20051107' Finished tagging patch 'TAG UPSTREAM_s-xml_1:20051107' luca@gismo:~/Downloads$ ===== This seems to working quite well and you don't need to play with `darcs mv` or `darcs record` :-D Thx, bye, Gismo / Luca