Opened 4 months ago

Closed 3 months ago

#31040 closed defect (fixed)

Stop showing git scripts changes, unless the base is master

Reported by: teor Owned by:
Priority: Medium Milestone: Tor: 0.4.2.x-final
Component: Core Tor/Tor Version: Tor:
Severity: Normal Keywords: asn-merge
Cc: rl1987 Actual Points:
Parent ID: Points: 0.5
Reviewer: nickm Sponsor:


In #29588, we made the pre-merge script log changes to the git scripts.

But it logs (the wrong) changes when I'm merging into maint-0.4.1 or earlier.

Let's just make it log changes when it's merging into master?

Child Tickets

Change History (6)

comment:1 Changed 4 months ago by rl1987

Status: newneeds_review

comment:2 Changed 3 months ago by nickm

Milestone: Tor: unspecifiedTor: 0.4.2.x-final

comment:3 Changed 3 months ago by nickm

Keywords: 041-should? removed

comment:4 Changed 3 months ago by dgoulet

Reviewer: nickm

comment:5 Changed 3 months ago by nickm

Keywords: asn-merge added
Status: needs_reviewmerge_ready

looks okay to me

comment:6 Changed 3 months ago by asn

Resolution: fixed
Status: merge_readyclosed


Note: See TracTickets for help on using tickets.