Dear maintainers,

I have been trying to fix uscan error of Emacs addon packages.  When
working on volume-el, I found that the repo on salsa didn't accept merge
requests while most other packages did.  If it can open up merge request
access it would be great and I have some pending d/watch fixes.  Thanks
in advance!

Xiyue Deng <manphiz@gmail.com> writes:
at the very least may indicate the Uploader doesn't want to monitor
Salsa for MRs.

You can use git-format-patch to prepare a patch series from your git
history, and can attach those to a bug report here.

To retitle this bug, but this as the first line in your reply (won't
work with HTML email, of course):

Control: retitle -1 src:volume-el: Useful subject of choice
Control: tag -1 patch

If you attach a patch, I recommend updating the metadata with that
second line.

Cheers,
Nicholas

retitle -1 src:volume-el: disable d/watch and sync to latest head version
tag -1 patch
severity -1 minor
thanks

Nicholas D Steeves <sten@debian.org> writes:

Thanks for the explanation, Nicolas!  Totally make sense.

Done.

Done.  A little bit of explanation for the changes:

* Upstream never had any tags, so uscan will always fail, so disable
  d/watch for now.  This will result in an empty uscan results.

* Sync to latest head version, which basically just incorporated Sean's
  patch upstream so that we don't need to host the patch anymore.

Please see the patches attached.

retitle 1041824 src:volume-el: disable d/watch and sync to latest head version
tag 1041824 patch
severity 1041824 minor
thanks

Apparently I misunderstood how "Control:" and control@bugs.debian.org
work.  Hopefully this time it should work.

Manphiz <manphiz@gmail.com> writes:

You're welcome!

Why is breaking notification of any future upstream tags better than
using uscan's git mode?  Uscan's git mode will notify when upstream
pushes any commit, with or without a tag.  Help is available in
#debian-mentors if writing an output format line that is suitable for
volume-el's existing version scheme is too challenging.

Regards,
Nicholas

Nicholas D Steeves <sten@debian.org> writes:

Hi Nicolas,

Before implementing tracking all upstream commits, I wonder whether this
is a good idea.  AIUI we use uscan to track upstream tags for releases
instead of tracking development activity.  If upstream doesn't provide
releases or tags, I think it's up to the maintainer whether to use a new
upstream head as a new release.  However if we use uscan to track that I
wonder whether it may cause extra noise like in udd.debian.org or
tracker.debian.org as it may notify all upstream activities.

What do you think?

control: tag -1 + wontfix

Hello,

Thank you for these submissions.

Patches don't really work for merging new upstream releases -- in this
case, pushing a branch somewhere and inviting me to merge it is better.
For proposed new changes rather than merges, I do indeed prefer patches,
so thank you for preparing those.

In this case, I would prefer not to merge the new upstream, because it
doesn't actually change the package.  It's not a problem carrying the
patch, and I think it's preferable.

As for your first patch, I don't follow -- I think I already fixed that
a while ago?  Indeed, the patch does not apply to our team's repository.

I would prefer not to apply the final patch until the QA team come and
tell us that we should disable watch files like that.

Sean Whitton <spwhitton@spwhitton.name> writes:

Hi Sean,

Thanks for the comments and I understand your reasons.  Actually I am
also unsure about how to deal with uscan errors with a watch file that
tracks upstream tags that don't exist, and as you and Nicolas both
suggest against disabling them, I think I may need to rethink how to
approach this.  I'll probably ask in emacsen-team@ for comments later.

control: reopen -1
control: retitle -1 src:volume-el: repair d/watch to track upstream head

Manphiz <manphiz@gmail.com> writes:

Hi Nicolas, Sean,

After consulting #debian-mentors I'm more convinced that tracking
upstream head is the way to go.  So I've done that and attached the
patch.  PTAL.  Thanks!