Your message dated Sat, 14 Mar 2026 17:12:20 +0000
with message-id
<c3c137714ba8e84ce62f4c018988397df4672e9a.ca...@adam-barratt.org.uk>
and subject line Re: Bug#1091835: dak: cron hourly [ddaccess]: Pulling without
specifying how to reconcile divergent branches is discouraged.
has caused the Debian Bug report #1091835,
regarding dak: cron hourly [ddaccess]: Pulling without specifying how to
reconcile divergent branches is discouraged.
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 [email protected]
immediately.)
--
1091835: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1091835
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: ftp.debian.org
Severity: normal
X-Debbugs-Cc: [email protected]
Hi,
Noticed this warning in hourly_2025.01.01-08\:00\:07.log:
Jan 01 08:00:08 fasolo hourly[2382985]: ########## hourly BEGIN: ddaccess
##########
Jan 01 08:00:08 fasolo hourly[2382985]: NEW RSS feed
Jan 01 08:00:08 fasolo hourly[2382985]: Trigger dd accessible parts sync
HEAD is now at e3eafa7 ignore graph_new subdir
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Jan 01 08:00:09 fasolo hourly[2382985]: ########## hourly END: removalstxt
##########
Which ideally should not be in the log.
Best regards,
Niels
OpenPGP_signature.asc
Description: OpenPGP digital signature
--- End Message ---
--- Begin Message ---
On Wed, 2025-01-01 at 09:14 +0100, Niels Thykier wrote:
> Noticed this warning in hourly_2025.01.01-08\:00\:07.log:
>
> > Jan 01 08:00:08 fasolo hourly[2382985]: ########## hourly BEGIN:
> > ddaccess ##########
> > Jan 01 08:00:08 fasolo hourly[2382985]: NEW RSS feed
> > Jan 01 08:00:08 fasolo hourly[2382985]: Trigger dd accessible parts
> > sync
> > HEAD is now at e3eafa7 ignore graph_new subdir
> > hint: Pulling without specifying how to reconcile divergent
> > branches is
> > hint: discouraged. You can squelch this message by running one of
> > the following
> > hint: commands sometime before your next pull:
> > hint:
> > hint: git config pull.rebase false # merge (the default
> > strategy)
> > hint: git config pull.rebase true # rebase
> > hint: git config pull.ff only # fast-forward only
> > hint:
> > hint: You can replace "git config" with "git config --global" to
> > set a default
> > hint: preference for all repositories. You can also pass --rebase,
> > --no-rebase,
> > hint: or --ff-only on the command line to override the configured
> > default per
> > hint: invocation.
> > Jan 01 08:00:09 fasolo hourly[2382985]: ########## hourly END:
> > removalstxt ##########
It looks like that got resolved:
adsb@coccia:~$ bzgrep reconcile /srv/ftp-master.debian.org/log/cron/*
adsb@coccia:~$
Regards,
Adam
--- End Message ---
