Ticket #736 (closed Task: fixed)

Opened 6 years ago

Last modified 5 years ago

Trac repository lost sync

Reported by: jri Owned by: jri
Priority: Major Milestone:
Component: Trac Version:
Keywords: Cc: dgf
Complexity: 3 Area:
Module:

Description

Hi dgf!

Can you please sync the "deepamehta" Trac repo. Apparently it lost sync.

Liebe Grüße
Jörg

Change History

comment:1 Changed 6 years ago by jri

  • Status changed from new to closed
  • Resolution set to worksforme

With my recent commit apparently the repo got re-synced.
So it works for me.

comment:2 Changed 6 years ago by jri

Just a note: for the commits that are re-synced after the fact the auto-ticket-update feature doesn't work.

comment:3 Changed 6 years ago by jri

  • Status changed from closed to reopened
  • Resolution worksforme deleted

Dgf, can you please sync the "deepamehta" Trac repo.
Apparently it lost sync again.

comment:4 follow-up: ↓ 5 Changed 6 years ago by dgf

  • Status changed from reopened to closed
  • Resolution set to fixed

How did this happen? Have you forced a push with a changed history?

comment:5 in reply to: ↑ 4 Changed 6 years ago by jri

Replying to dgf:

Have you forced a push with a changed history?

Not really. However I did some git cherry-picks for the first time (in the course of releasing 4.4.3). But these are regular commits, right?

Thank you very much!

comment:6 Changed 5 years ago by jri

  • Status changed from closed to reopened
  • Resolution fixed deleted

Hi Danny!
Can you please re-sync the Trac DM repo.
Yesterday the repo lost sync after pushing a merge-into-master commit. No History was changed.

comment:7 follow-up: ↓ 9 Changed 5 years ago by dgf

re-sync is done

Can you reproduce this behavior?

Should we re-sync every night with a cron job?

comment:8 Changed 5 years ago by dgf

  • Status changed from reopened to assigned
  • Owner set to jri

comment:9 in reply to: ↑ 7 Changed 5 years ago by jri

Replying to dgf:

re-sync is done

Thank you very much!

Can you reproduce this behavior?

Not really.
It run flawless for more than 7 months now.
My intuition is that the github-to-trac push mechanism sometimes stumble when a "git merge" or "git cherry-pick" commit is involved.

Should we re-sync every night with a cron job?

I would rather not.
The current workflow is quite optimal and I like it very much. In particular I like the ticket-auto-update feature, I mean when the trac-git plugin parses the commit message, looking e.g. for "See #xxx" and updates the corresponding ticket by automatically adding a comment. This ticket update in turn is then (regularly) emailed by trac to each person involved in that ticket. So every developer is always informed about all relevant dev changes and news, just in time. I feel this workflow is quite perfect and I want keep it this way.

With a re-sync cron job just the repos would be synced but we would loose the ticket-auto-update and the just-in-time notifications. You can see this when you sync the repos manually. The tickets for the pending commits are *not* updated and thus no notifications are send.

Probably there is a newer version of the trac-git plugin that handles "git merge" or "git cherry-pick" commits properly.

Thank you very much!

comment:10 Changed 5 years ago by jri

  • Status changed from assigned to closed
  • Resolution set to fixed

comment:11 Changed 5 years ago by jri

  • Status changed from closed to reopened
  • Resolution fixed deleted

Sorry, can you please resync again.

Again after pushing a merge-into-master commit the Trac repo lost sync.
Now the pattern becomes clear: merging into master is the "culprit".

comment:12 Changed 5 years ago by jri

Danny, can you please resync?
Otherwise my commits will not auto-comment on the respective tickets.
Thank you!

comment:13 Changed 5 years ago by dgf

  • Status changed from reopened to closed
  • Resolution set to fixed

synced again

comment:14 Changed 5 years ago by jri

Cool. Thank you!

Note: See TracTickets for help on using tickets.