[cl-debian] dbp-importorig: how to keep no more present files?
Hello! I was trying to import a new CVS checkout of S-XML with dbp-importorig and I got a problem: some files aren't present in the CVS (the doc/ folder), while others are new. ===== luca@gismo:~/Hacking/cl-debian/repository$ dbp-importorig \ -v ~/Downloads/s-xml.tar.gz s-xml 1:20051106 Running: tar ["-zxSpf","/home/luca/Downloads/s-xml.tar.gz"] tar: s-xml/src: implausibly old time stamp 1970-01-01 01:00:00 tar: s-xml/test: implausibly old time stamp 1970-01-01 01:00:00 tar: s-xml: implausibly old time stamp 1970-01-01 01:00:00 darcs ["changes","--patches=^TAG"] Running: darcs_load_dirs \ ["--wc=/home/luca/var/lib/debdarcs/s-xml-upstream", \ "--summary=Import upstream s-xml version 1:20051106", \ "/home/luca/var/lib/debdarcs/,,dbp-importorigtargz-KS3hv9/s-xml"] TLACMD: darcs Num Source Files Num Destination Files --- ----------------------------------- --- --------------------------- 0 doc/ 0 test/echo.lisp 1 doc/S-XML.html 1 test/simple.xml 2 doc/index.html 2 3 doc/style.css 3 Syntax: src dest [,src dest [,...]] to move, q to accept, r to redraw: Command: ===== Now, I'm not sure the above should be the best options: - if I choose to map one src to a dest, well, I lose a new file :-( - accepting with q will generate an upstream which doesn't contain anymore the doc/ folder 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? Thx, bye, Gismo / Luca
Hello, 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. 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. Groetjes, Peter -- signature -at- pvaneynd.mailworks.org http://www.livejournal.com/users/pvaneynd/ "God, root, what is difference?" Pitr | "God is more forgiving." Dave Aronson|
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
participants (2)
-
Luca Capello -
Peter Van Eynde