Sorry for the confusion,

On 27.01.24 12:37, Torsten Landschoff wrote:
Hi Matthias,

Am 2024-01-26 17:14, schrieb Matthias Klose:
uploaded NMU 4.2.0-0.1 to DELAYED/5

I had 4.2.0-1 in work at salsa and tried uploading it now to avoid the delay.

Now the queue daemon rejected my upload because the existing uploaded:

--------------------------
/swig_4.2.0-1_source.changes is already present on target host:
5-day/swig_4.2.0.orig.tar.gz
Either you already uploaded it, or someone else came first.
Job swig_4.2.0-1_source.changes removed.
--------------------------

AFAIR remember, a direct upload should take precedence over a delayed one.

I wonder what the best way forward would be here.

* Wait for the delayed upload to get processed
* Prepare a new upload without the orig.tar.gz
* Overwrite 4.2.0-0.1?

I'd like to have the debian/changelog contain all versions ever in unstable, but
I have no idea how I would merge those changes.

Maybe just put your changelog entry into debian/master :shrug:

Do you have a better solution?

I just ran
dcut ftp-master cancel swig_4.2.0-0.1_source.changes

So you should be able to do a normal upload, when this command is processed.

Reply via email to