Ticket #185 (closed defect: fixed)

Opened 5 years ago

Last modified 4 years ago

mercurial in-repo branches are not handled properly from hgbuildbot

Reported by: dsallings Owned by:
Priority: major Milestone: 0.7.10
Version: 0.7.6 Keywords: mercurial, review
Cc: marcusl, dustin

Description

hgbuildbot incorrectly uses the working directory's current branch for all branches it sends. Each changeset belongs to a branch, and the changeset's branch should be consulted instead. Patch included (may require my patch from #181 to apply smoothly, but merging should be trivial otherwise).

Attachments

hgbuildbot-branch.diff Download (885 bytes) - added by dsallings 5 years ago.
patch for getting the branch correct in hgbuildbot
185.patch Download (750 bytes) - added by dustin 4 years ago.
185.patch

Change History

Changed 5 years ago by dsallings

patch for getting the branch correct in hgbuildbot

comment:1 Changed 4 years ago by marcusl

  • Cc marcusl added

comment:2 Changed 4 years ago by marcusl

In order to work with the later patches in #181, it should be 

            if branchtype == 'inrepo': 
                branch = extra['branch']

That works pretty well.

comment:3 Changed 4 years ago by marcusl

  • Cc dustin added
  • Keywords mercurial, review added; mercurial removed

Dustin. I think you can apply this and then close #65 (which is a sort of master ticket for inrepo branches.)

Changed 4 years ago by dustin

185.patch

comment:4 Changed 4 years ago by dustin

  • Status changed from new to closed
  • Resolution set to fixed 
commit 42eececea1158fbc525c0f0404bf04b183c616a4
Author: Marcus Lindblom <macke@yar.nu>
Date:   Mon Feb 2 10:17:56 2009 -0500

    (fixes #185) (MercurialInRepo) send the branch from the changeset, not the working directory

comment:5 Changed 4 years ago by dustin

  • Milestone changed from undecided to 0.7.10
Note: See TracTickets for help on using tickets.