Opened 5 years ago

Closed 5 years ago

#771 closed defect (fixed)

Filter master cannot deal with branches

Reported by: trev Assignee: trev
Priority: P1 Milestone:
Module: Infrastructure Keywords:
Cc: christian Blocked By:
Blocking: Platform: Unknown
Ready: yes Confidential: no
Tester: Verified working: no
Review URL(s):

http://codereview.adblockplus.org/6200604430958592/

Description

How to reproduce

  1. Have the filter master update EasyList repository to tip.
  2. Now do hg up -r -2 in your local copy, commit a new change and push it with hg push -f (this creates two heads on the default branch, with the filter master being on the "wrong" head).

Observed behaviour

update_repos.sh script fails with the following error message:

not updating: crosses branches (merge branches or update --check to force update)

Expected behaviour

The script should update to tip latest commit on the default branch, no matter whether it crosses branches. This likely means splitting hg pull --update into hg pull and hg update --check in update_repos.sh.

Change History (3)

comment:1 Changed 5 years ago by trev

  • Owner set to trev

comment:2 Changed 5 years ago by trev

  • Review URL(s) modified (diff)
  • Status changed from new to reviewing

comment:3 Changed 5 years ago by trev

  • Resolution set to fixed
  • Status changed from reviewing to closed
Note: See TracTickets for help on using tickets.