Open Bug 901024 Opened 11 years ago Updated 10 years ago

Detect tree merge conflicts

Categories

(Developer Services :: Mercurial: mozext, defect)

Product:
Developer Services
Component:
Mercurial: mozext
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

People

(Reporter: gps, Unassigned)

Details

(Whiteboard: [kanban:engops:https://mozilla.kanbanize.com/ctrl_board/6/658] ) 

Since development in the mozext world uses a unified repository, it should be possible to proactively detect merge conflicts across integration branches and landing branches.

I /think/ it will be in the realm of possibility to examine incoming/outgoing changesets at pull/push time and look for merge conflicts. If that's not possible due to performance issues, we should at least be able to offer a command that does this so sheriffs (or some automated system) can detect merge conflicts early and often.
Summary: Proactively detect merge conflicts → Detect tree merge conflicts
Product: Other Applications → Developer Services
Whiteboard: [kanban:engops:https://kanbanize.com/ctrl_board/6/224]
Whiteboard: [kanban:engops:https://kanbanize.com/ctrl_board/6/224] → [kanban:engops:https://mozilla.kanbanize.com/ctrl_board/6/658] [kanban:engops:https://kanbanize.com/ctrl_board/6/224]
Whiteboard: [kanban:engops:https://mozilla.kanbanize.com/ctrl_board/6/658] [kanban:engops:https://kanbanize.com/ctrl_board/6/224] → [kanban:engops:https://mozilla.kanbanize.com/ctrl_board/6/658]
You need to log in before you can comment on or make changes to this bug.