On Fri, May 27, 2005 at 10:49:14PM -0500, John Goerzen wrote:
> Looks like you need to tweak your _darcs/prefs/boring file. Either
> that, or remove this .orig file from the package and then import it.
>
> Try that and let me know how it works for you.
Hmm. Strangeness ensued when I ran dbp-importorig on a new upstream
version.
After the first run I got:
(hundreds of darcs messages about changed files that overran my
xterm's buffer size)
84a 84a world/world_129_125
84b 84b world/world_129_126
84c 84c world/world_129_127
84d 84d world/world_129_128
84e 84e world/world_129_129
Syntax: src dest [,src dest [,...]] to move, q to accept, r to redraw:
Command: q
The following directory is already in the repository;
note that to ensure portability we don't allow
files that differ only in case. Use --case-ok to override this:
lake_country
darcs failed: No files were added
Traceback (most recent call last):
File "/usr/bin/darcs_load_dirs", line 26, in ?
init.run(darcsdefault=True)
File "/usr/lib/python2.3/site-packages/tla_support/init.py", line 50, in run
summary = options.summary).main()
File "/usr/lib/python2.3/site-packages/tla_support/tla_interact.py", line
109, in main
self.catchup(needsupdate)
File "/usr/lib/python2.3/site-packages/tla_support/tla_interact.py", line
132, in catchup
self.addfile(file)
File "/usr/lib/python2.3/site-packages/tla_support/tla_interact.py", line
151, in addfile
self.wcobj.addtag(file)
File "/usr/lib/python2.3/site-packages/tla_support/tla_wc.py", line 71, in
addtag
[cmd().add, file])
File "/usr/lib/python2.3/site-packages/tla_support/util.py", line 111, in
chdircmd
return apply(func, args, kwargs)
File "/usr/lib/python2.3/site-packages/tla_support/util.py", line 67, in
safeexec
return checkresult(result, expected)
File "/usr/lib/python2.3/site-packages/tla_support/util.py", line 95, in
checkresult
raise ExecProblem, info + " (expected exit code %d)" % expected
tla_support.util.ExecProblem: exited with code 2 (expected exit code 0)
Command darcs_load_dirs
["--wc=/home/kari/debdarcs/crossfire-maps.upstream","--summary=Import upstream
crossfire-maps version
1.7.0","/home/kari/debdarcs/,,dbp-importorigtargz-h1ceFe/maps"] failed; exit
code 1
Fail: user error (Command darcs_load_dirs
["--wc=/home/kari/debdarcs/crossfire-maps.upstream","--summary=Import upstream
crossfire-maps version
1.7.0","/home/kari/debdarcs/,,dbp-importorigtargz-h1ceFe/maps"] failed; exit
code 1)
Then I just tried again:
[EMAIL PROTECTED]:~/debdarcs$ dbp-importorig crossfire-1.7.0.maps.tar.gz
crossfire-maps 1.7.0
TLACMD: darcs
LOGTEXT Imported maps
into Darcs repository
Finished recording patch 'Import upstream crossfire-maps version 1.7.0'
Finished tagging patch 'TAG UPSTREAM_crossfire-maps_1.7.0'
[EMAIL PROTECTED]:~/debdarcs$
I have yet to see if everything is as they should be and what errors
(if any) I get when I actually try to make a package out of this and
if I can actually do that. But this seems a bit weird to me. The
other two source packages went through dbp-importdsc and
dbp-importorig (to update both to new upstream versions) smoothly, but
they didn't have boring files in them either.
I can't really change the boring file, as it is generated by
dbp-importdsc here. Making my orig.tar.gz differ from the upstream
tarball over this doesn't seem worth it either.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
