Ticket #249 (closed defect: fixed)

Opened 5 years ago

Last modified 4 years ago

git_buildbot.py does not send merge changesets

Reported by: dsallings Owned by: warner
Priority: major Milestone: 0.7.10
Version: 0.7.6 Keywords:
Cc:

Description (last modified by dustin) (diff)

Because merge changesets don't directly affect files, they aren't sent from git_buildbot.py.

Attached is a patch that sends a synthetic "merge" file to make buildbot happy.

Attachments

git_buildbot+merge.diff Download (607 bytes) - added by dsallings 5 years ago.
Send merge changes from git.

Change History

Changed 5 years ago by dsallings

Send merge changes from git.

comment:1 Changed 5 years ago by warner

  • Owner set to warner
  • Status changed from new to assigned
  • Milestone changed from undecided to 0.7.8

I don't know much about git, but if you say this is a good patch to apply, I'll apply it :).

comment:2 Changed 4 years ago by dustin

  • Status changed from assigned to closed
  • Resolution set to fixed
  • Description modified (diff)
  • Milestone changed from 0.8.0 to 0.7.10

applied back in april: 

commit ac70a83fa05c2b1b31dd9411ffc28876fb9e9f20
Author: Dustin Sallings <dustin@spy.net>
Date:   Sat Apr 19 08:40:20 2008 +0800

    Send merge changes from git.
    
    Signed-off-by: Dustin J. Mitchell <dustin@zmanda.com>
Note: See TracTickets for help on using tickets.