[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#223177: marked as done (/usr/bin/tbp-importdsc: Weird conflicts when importing initial source)



Your message dated Thu, 10 Mar 2011 09:33:11 +0000
with message-id <E1PxcF5-0001HW-Go@franck.debian.org>
and subject line Bug#617585: Removed package(s) from unstable
has caused the Debian Bug report #223177,
regarding /usr/bin/tbp-importdsc: Weird conflicts when importing initial source
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
223177: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=223177
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: tla-buildpackage
Version: 0.9.3
Severity: normal
File: /usr/bin/tbp-importdsc

Hello,

I simply did:
 $ tla my-id "Brian May <bam@snoopy.apana.org.au>" 
 $ tbp-initarchive bam@debian.org--debian http://<deleted>@gyro.apana.org.au/dav/debian ~/tree/debian
 $ tla my-default-archive bam@debian.org--debian
 $ /usr/bin/tbp-importdsc dar_1.2.0-1.dsc
 $ /usr/bin/tbp-importdsc dar_1.2.0-2.dsc
 $ /usr/bin/tbp-importdsc dar_1.2.0-3.dsc
 $ /usr/bin/tbp-importdsc dar_1.2.1-1.dsc

When I got here though, things got slightly more complicated.

First, it detected a whole lot of *.ex files that where added
to debian/.

This seemed strange, but OK, It wasn't until later that I realized these
files weren't new, there were there all along.

Then I got the following output:

[...]
A  ./debian/.arch-ids/watch.ex.id
A  ./debian/README.Debian
A  ./debian/changelog
A  ./debian/conffiles.ex
A  ./debian/control
A  ./debian/copyright
A  ./debian/cron.d.ex
A  ./debian/dar-static.files
A  ./debian/dar.dirs
A  ./debian/dar.docs
A  ./debian/dar.files
A  ./debian/emacsen-install.ex
A  ./debian/emacsen-remove.ex
A  ./debian/emacsen-startup.ex
A  ./debian/ex.package.doc-base
A  ./debian/init.d.ex
A  ./debian/manpage.1.ex
A  ./debian/manpage.sgml.ex
A  ./debian/menu.ex
A  ./debian/postinst.ex
A  ./debian/postrm.ex
A  ./debian/preinst.ex
A  ./debian/prerm.ex
A  ./debian/rules
A  ./debian/watch.ex
-- ./BUGS
M  ./BUGS
-- ./CHANGES
M  ./CHANGES
-- ./INSTALL
M  ./INSTALL
-- ./LICENSE
-- ./Makefile
M  ./Makefile
-- ./NOTES
-- ./README
M  ./README
-- ./THANKS
M  ./THANKS
-- ./TODO
M  ./TODO
-- ./TUTORIAL
M  ./TUTORIAL
-- ./catalogue.cpp
M  ./catalogue.cpp
-- ./catalogue.hpp
M  ./catalogue.hpp
-- ./command_line.cpp
M  ./command_line.cpp
-- ./command_line.hpp
M  ./command_line.hpp
-- ./compressor.cpp
M  ./compressor.cpp
-- ./compressor.hpp
M  ./compressor.hpp
-- ./dar-help.c
-- ./dar.1
M  ./dar.1
-- ./dar.cpp
M  ./dar.cpp
-- ./dar.gif
-- ./dar.hpp
-- ./dar.rpm.spec
M  ./dar.rpm.spec
-- ./dar.usage
M  ./dar.usage
-- ./dar.xml
M  ./dar.xml
-- ./dar_manager.1
-- ./dar_manager.cpp
-- ./dar_manager.usage
M  ./dar_manager.usage
-- ./dar_manager.xml
-- ./dar_slave.1
-- ./dar_slave.cpp
M  ./dar_slave.cpp
-- ./dar_slave.usage
-- ./dar_slave.xml
-- ./dar_suite.cpp
M  ./dar_suite.cpp
-- ./dar_suite.hpp
-- ./dar_xform.1
-- ./dar_xform.cpp
M  ./dar_xform.cpp
-- ./dar_xform.usage
-- ./dar_xform.xml
-- ./data_tree.cpp
M  ./data_tree.cpp
-- ./data_tree.hpp
-- ./database.cpp
M  ./database.cpp
-- ./database.hpp
-- ./database_header.cpp
-- ./database_header.hpp
-- ./deci.cpp
-- ./deci.hpp
-- ./defile.cpp
-- ./defile.hpp
-- ./ea.cpp
-- ./ea.hpp
-- ./ea_filesystem.cpp
M  ./ea_filesystem.cpp
-- ./ea_filesystem.hpp
-- ./erreurs.cpp
M  ./erreurs.cpp
-- ./erreurs.hpp
-- ./etage.cpp
-- ./etage.hpp
-- ./factoriel.cpp
M  ./factoriel.cpp
-- ./filesystem.cpp
-- ./filesystem.hpp
-- ./filtre.cpp
M  ./filtre.cpp
-- ./filtre.hpp
-- ./generic_file.cpp
-- ./generic_file.hpp
-- ./header.cpp
M  ./header.cpp
-- ./header.hpp
M  ./header.hpp
-- ./header_version.cpp
-- ./header_version.hpp
-- ./infinint.cpp
-- ./infinint.hpp
-- ./integers.hpp
M  ./integers.hpp
-- ./macro_tools.cpp
-- ./macro_tools.hpp
-- ./mask.cpp
-- ./mask.hpp
-- ./null_file.hpp
-- ./path.cpp
M  ./path.cpp
-- ./path.hpp
-- ./prime.cpp
-- ./sar.cpp
-- ./sar.hpp
-- ./sar_tools.cpp
-- ./sar_tools.hpp
-- ./scrambler.cpp
-- ./scrambler.hpp
-- ./storage.cpp
-- ./storage.hpp
-- ./terminateur.cpp
-- ./terminateur.hpp
-- ./test_catalogue.cpp
M  ./test_catalogue.cpp
-- ./test_compressor.cpp
-- ./test_deci.cpp
M  ./test_deci.cpp
-- ./test_erreurs.cpp
M  ./test_erreurs.cpp
-- ./test_filesystem.cpp
M  ./test_filesystem.cpp
-- ./test_generic_file.cpp
M  ./test_generic_file.cpp
-- ./test_infinint.cpp
M  ./test_infinint.cpp
-- ./test_mask.cpp
M  ./test_mask.cpp
-- ./test_memory.cpp
-- ./test_memory.hpp
-- ./test_path.cpp
M  ./test_path.cpp
-- ./test_sar.cpp
M  ./test_sar.cpp
-- ./test_scrambler.cpp
-- ./test_storage.cpp
M  ./test_storage.cpp
-- ./test_terminateur.cpp
M  ./test_terminateur.cpp
-- ./test_tronc.cpp
M  ./test_tronc.cpp
-- ./test_tuyau.cpp
M  ./test_tuyau.cpp
-- ./testtools.cpp
M  ./testtools.cpp
-- ./testtools.hpp
-- ./tools.cpp
M  ./tools.cpp
-- ./tools.hpp
-- ./tronc.cpp
-- ./tronc.hpp
-- ./tuyau.cpp
-- ./tuyau.hpp
-- ./user_interaction.cpp
M  ./user_interaction.cpp
-- ./user_interaction.hpp
-- ./zapette.cpp
-- ./zapette.hpp
* update pristine tree (bam@debian.org--debian/dar--head--1.0--patch-1 => dar--head--1.0--patch-2)
* commited bam@debian.org--debian/dar--head--1.0--patch-2
 * tla revisions
Committed bam@debian.org--debian/dar--head--1.0--patch-2
 
Removing temporary directory /home/bam/tree/debian/,,tbp-importorigdir...
 * rm -fr "/home/bam/tree/debian/,,tbp-importorigdir"
 * tla commit -L "Added configs for upstream dar 1.2.1"
A  ./configs/upstream/dar/1.2.1
M  ./configs/upstream/dar/latest
* update pristine tree (bam@debian.org--debian/configs--head--1.0--patch-4 => configs--head--1.0--patch-5)
* commited bam@debian.org--debian/configs--head--1.0--patch-5
Removing temporary directory /home/bam/tree/debian/,,tbp-importorigtargz...
 * rm -fr "/home/bam/tree/debian/,,tbp-importorigtargz"
 * tla tree-version
 * tla cfgcat upstream/dar/1.2.1
 * tla revisions bam@debian.org--debian/dar--debian--1.0
 * dpkg-source -x "/home/bam/source/debian/unstable/dar/dar_1.2.1-1.dsc"
dpkg-source: extracting dar in dar-1.2.1
 * tla get "bam@debian.org--debian/dar--debian--1.0" "/home/bam/tree/debian/,,tbp-importdeb/,,tbp-importdeb-wc"
* from import revision: bam@debian.org--debian/dar--head--1.0--base-0
* patching for revision: bam@debian.org--debian/dar--head--1.0--patch-1
* patching for revision: bam@debian.org--debian/dar--debian--1.0--base-0
* patching for revision: bam@debian.org--debian/dar--debian--1.0--patch-1
* patching for revision: bam@debian.org--debian/dar--debian--1.0--patch-2
* patching for revision: bam@debian.org--debian/dar--debian--1.0--patch-3
* making pristine copy
* tree version set bam@debian.org--debian/dar--debian--1.0
 * dpkg-parsechangelog
 * tla replay --in-place . "bam@debian.org--debian/dar--head--1.0"
* patching for revision bam@debian.org--debian/dar--head--1.0--patch-2
D   ./.arch-ids/RESUME.id
D   ./RESUME
CA  ./debian/.arch-ids/=id
CA  ./debian/.arch-ids/README.Debian.id
CA  ./debian/.arch-ids/changelog.id
CA  ./debian/.arch-ids/conffiles.ex.id
CA  ./debian/.arch-ids/control.id
CA  ./debian/.arch-ids/copyright.id
CA  ./debian/.arch-ids/cron.d.ex.id
CA  ./debian/.arch-ids/dar-static.files.id
CA  ./debian/.arch-ids/dar.dirs.id
CA  ./debian/.arch-ids/dar.docs.id
CA  ./debian/.arch-ids/dar.files.id
CA  ./debian/.arch-ids/emacsen-install.ex.id
CA  ./debian/.arch-ids/emacsen-remove.ex.id
CA  ./debian/.arch-ids/emacsen-startup.ex.id
CA  ./debian/.arch-ids/ex.package.doc-base.id
CA  ./debian/.arch-ids/init.d.ex.id
CA  ./debian/.arch-ids/manpage.1.ex.id
CA  ./debian/.arch-ids/manpage.sgml.ex.id
CA  ./debian/.arch-ids/menu.ex.id
CA  ./debian/.arch-ids/postinst.ex.id
CA  ./debian/.arch-ids/postrm.ex.id
CA  ./debian/.arch-ids/preinst.ex.id
CA  ./debian/.arch-ids/prerm.ex.id
CA  ./debian/.arch-ids/rules.id
CA  ./debian/.arch-ids/watch.ex.id
CA  ./debian/README.Debian
CA  ./debian/changelog
CA  ./debian/conffiles.ex
CA  ./debian/control
CA  ./debian/copyright
CA  ./debian/cron.d.ex
CA  ./debian/dar-static.files
CA  ./debian/dar.dirs
CA  ./debian/dar.docs
CA  ./debian/dar.files
CA  ./debian/emacsen-install.ex
CA  ./debian/emacsen-remove.ex
CA  ./debian/emacsen-startup.ex
CA  ./debian/ex.package.doc-base
CA  ./debian/init.d.ex
CA  ./debian/manpage.1.ex
CA  ./debian/manpage.sgml.ex
CA  ./debian/menu.ex
CA  ./debian/postinst.ex
CA  ./debian/postrm.ex
CA  ./debian/preinst.ex
CA  ./debian/prerm.ex
CA  ./debian/rules
CA  ./debian/watch.ex
A   ./{arch}/dar/dar--head/dar--head--1.0/bam@debian.org--debian/patch-log/patch-2
M   ./BUGS
M   ./CHANGES
M   ./INSTALL
C   ./Makefile
M   ./README
M   ./THANKS
M   ./TODO
M   ./TUTORIAL
M   ./catalogue.cpp
M   ./catalogue.hpp
M   ./command_line.cpp
M   ./command_line.hpp
M   ./compressor.cpp
M   ./compressor.hpp
M   ./dar.1
M   ./dar.cpp
M   ./dar.rpm.spec
M   ./dar.usage
M   ./dar.xml
M   ./dar_manager.usage
M   ./dar_slave.cpp
M   ./dar_suite.cpp
M   ./dar_xform.cpp
M   ./data_tree.cpp
M   ./database.cpp
M   ./ea_filesystem.cpp
M   ./erreurs.cpp
M   ./factoriel.cpp
M   ./filtre.cpp
M   ./header.cpp
M   ./header.hpp
C   ./integers.hpp
M   ./path.cpp
M   ./test_catalogue.cpp
M   ./test_deci.cpp
M   ./test_erreurs.cpp
M   ./test_filesystem.cpp
M   ./test_generic_file.cpp
M   ./test_infinint.cpp
M   ./test_mask.cpp
M   ./test_path.cpp
M   ./test_sar.cpp
M   ./test_storage.cpp
M   ./test_terminateur.cpp
M   ./test_tronc.cpp
M   ./test_tuyau.cpp
M   ./testtools.cpp
M   ./tools.cpp
M   ./user_interaction.cpp
--  ./BUGS
--  ./CHANGES
--  ./INSTALL
--  ./LICENSE
--  ./Makefile
--  ./NOTES
--  ./README
--  ./THANKS
--  ./TODO
--  ./TUTORIAL
--  ./catalogue.cpp
--  ./catalogue.hpp
--  ./command_line.cpp
--  ./command_line.hpp
--  ./compressor.cpp
--  ./compressor.hpp
--  ./dar-help.c
--  ./dar.1
--  ./dar.cpp
--  ./dar.gif
--  ./dar.hpp
--  ./dar.rpm.spec
--  ./dar.usage
--  ./dar.xml
--  ./dar_manager.1
--  ./dar_manager.cpp
--  ./dar_manager.usage
--  ./dar_manager.xml
--  ./dar_slave.1
--  ./dar_slave.cpp
--  ./dar_slave.usage
--  ./dar_slave.xml
--  ./dar_suite.cpp
--  ./dar_suite.hpp
--  ./dar_xform.1
--  ./dar_xform.cpp
--  ./dar_xform.usage
--  ./dar_xform.xml
--  ./data_tree.cpp
--  ./data_tree.hpp
--  ./database.cpp
--  ./database.hpp
--  ./database_header.cpp
--  ./database_header.hpp
--  ./deci.cpp
--  ./deci.hpp
--  ./defile.cpp
--  ./defile.hpp
--  ./ea.cpp
--  ./ea.hpp
--  ./ea_filesystem.cpp
--  ./ea_filesystem.hpp
--  ./erreurs.cpp
--  ./erreurs.hpp
--  ./etage.cpp
--  ./etage.hpp
--  ./factoriel.cpp
--  ./filesystem.cpp
--  ./filesystem.hpp
--  ./filtre.cpp
--  ./filtre.hpp
--  ./generic_file.cpp
--  ./generic_file.hpp
--  ./header.cpp
--  ./header.hpp
--  ./header_version.cpp
--  ./header_version.hpp
--  ./infinint.cpp
--  ./infinint.hpp
--  ./integers.hpp
--  ./macro_tools.cpp
--  ./macro_tools.hpp
--  ./mask.cpp
--  ./mask.hpp
--  ./null_file.hpp
--  ./path.cpp
--  ./path.hpp
--  ./prime.cpp
--  ./sar.cpp
--  ./sar.hpp
--  ./sar_tools.cpp
--  ./sar_tools.hpp
--  ./scrambler.cpp
--  ./scrambler.hpp
--  ./storage.cpp
--  ./storage.hpp
--  ./terminateur.cpp
--  ./terminateur.hpp
--  ./test_catalogue.cpp
--  ./test_compressor.cpp
--  ./test_deci.cpp
--  ./test_erreurs.cpp
--  ./test_filesystem.cpp
--  ./test_generic_file.cpp
--  ./test_infinint.cpp
--  ./test_mask.cpp
--  ./test_memory.cpp
--  ./test_memory.hpp
--  ./test_path.cpp
--  ./test_sar.cpp
--  ./test_scrambler.cpp
--  ./test_storage.cpp
--  ./test_terminateur.cpp
--  ./test_tronc.cpp
--  ./test_tuyau.cpp
--  ./testtools.cpp
--  ./testtools.hpp
--  ./tools.cpp
--  ./tools.hpp
--  ./tronc.cpp
--  ./tronc.hpp
--  ./tuyau.cpp
--  ./tuyau.hpp
--  ./user_interaction.cpp
--  ./user_interaction.hpp
--  ./zapette.cpp
--  ./zapette.hpp
 
replay: conflicts occured during replay
 * tla inventory -b
 * tla_load_dirs --wc="/home/bam/tree/debian/,,tbp-importdeb/,,tbp-importdeb-wc" --summary="Import Debian dar version 1.2.1-1" "/home/bam/tree/debian/,,tbp-importdeb/dar-1.2.1"Num Source Files                        Num Destination Files
--- ----------------------------------- --- -----------------------------------
  0 debian/README.Debian.orig             0 debian/README.Debian
  1 debian/README.Debian.rej              1 debian/changelog
  2 debian/changelog.orig                 2 debian/conffiles.ex
  3 debian/changelog.rej                  3 debian/control
  4 debian/conffiles.ex.orig              4 debian/copyright
  5 debian/conffiles.ex.rej               5 debian/cron.d.ex
  6 debian/control.orig                   6 debian/dar-static.files
  7 debian/control.rej                    7 debian/dar.dirs
  8 debian/copyright.orig                 8 debian/dar.docs
  9 debian/copyright.rej                  9 debian/dar.files
  a debian/cron.d.ex.orig                 a debian/emacsen-install.ex
  b debian/cron.d.ex.rej                  b debian/emacsen-remove.ex
  c debian/dar-static.files.orig          c debian/emacsen-startup.ex
  d debian/dar-static.files.rej           d debian/ex.package.doc-base
  e debian/dar.dirs.orig                  e debian/init.d.ex
  f debian/dar.dirs.rej                   f debian/manpage.1.ex
 10 debian/dar.docs.orig                 10 debian/manpage.sgml.ex
 11 debian/dar.docs.rej                  11 debian/menu.ex
 12 debian/dar.files.orig                12 debian/postinst.ex
 13 debian/dar.files.rej                 13 debian/postrm.ex
 14 debian/emacsen-install.ex.orig       14 debian/preinst.ex
 15 debian/emacsen-install.ex.rej        15 debian/prerm.ex
 16 debian/emacsen-remove.ex.orig        16 debian/rules
 17 debian/emacsen-remove.ex.rej         17 debian/watch.ex
 18 debian/emacsen-startup.ex.orig       18
 19 debian/emacsen-startup.ex.rej        19
 1a debian/ex.package.doc-base.orig      1a
 1b debian/ex.package.doc-base.rej       1b
 1c debian/init.d.ex.orig                1c
 1d debian/init.d.ex.rej                 1d
 1e debian/manpage.1.ex.orig             1e
 1f debian/manpage.1.ex.rej              1f
 20 debian/manpage.sgml.ex.orig          20
 21 debian/manpage.sgml.ex.rej           21
 22 debian/menu.ex.orig                  22
 23 debian/menu.ex.rej                   23
 24 debian/postinst.ex.orig              24
 25 debian/postinst.ex.rej               25
 26 debian/postrm.ex.orig                26
 27 debian/postrm.ex.rej                 27
 28 debian/preinst.ex.orig               28
 29 debian/preinst.ex.rej                29
 2a debian/prerm.ex.orig                 2a
 2b debian/prerm.ex.rej                  2b
 2c debian/rules.orig                    2c
 2d debian/rules.rej                     2d
 2e debian/watch.ex.orig                 2e
 2f debian/watch.ex.rej                  2f
Syntax: src dest [,src dest [,...]] to move, q to accept, r to redraw:
Command:

At this stage, I suspect the process stuffed up, and
I shouldn't continue any further....

Anyway, I also noticed that I have a Debian archive instead of
a upstream+diff archive like I thought I did (hmmm... would be
nice if there was someway to automatically detect this
error before uploading to the Debian archive, not months after
the event...):

dar_1.2.1-1.dsc
dar_1.2.1-1.tar.gz

It would be nice if this error could be detected instead of blindly
importing the tar.gz file into the upstream tree (as I suspect is what
happened here).

I also think that conflicts should be detected as "something serious
went wrong" rather then "files to be added/deleted".

Even better would be if I could somehow give the upstream archive, and the
scripts could automatically work out what changed.

(side note: can these scripts cope with real debian-native packages?)

-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux scrooge 2.4.22-1-386 #9 Sat Oct 4 14:30:39 EST 2003 i686
Locale: LANG=C, LC_CTYPE=C

Versions of packages tla-buildpackage depends on:
ii  devscripts                    2.7.94.3   Scripts to make the life of a Debi
ii  dpkg-dev                      1.10.18    Package building tools for Debian
ii  python-apt                    0.5.8      Python interface to libapt-pkg
ii  python2.3                     2.3.2-7    An interactive high-level object-o
ii  tla                           1.0.6-3    arch revision control system
ii  tla-load-dirs                 1.0.10     Import upstream archives into tla/

-- no debconf information



--- End Message ---
--- Begin Message ---
Version: 0.9.14+rm

Dear submitter,

as the package tla-buildpackage has just been removed from the Debian archive
unstable we hereby close the associated bug reports.  We are sorry
that we couldn't deal with your issue properly.

For details on the removal, please see http://bugs.debian.org/617585

The version of this package that was in Debian prior to this removal
can still be found using http://snapshot.debian.org/.

This message was generated automatically; if you believe that there is
a problem with it please contact the archive administrators by mailing
ftpmaster@debian.org.

Debian distribution maintenance software
pp.
Alexander Reichle-Schmehl (the ftpmaster behind the curtain)


--- End Message ---

Reply to: