Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9718 - Ms2ger:clean-sync, r=jgraham

Browse source 
Support syncing from a clean tree.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9718)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-27 02:31:07 +05:30
commit d424bd14e5
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/wpt/update/upstream.py
View file

@ -4,7 +4,7 @@ import subprocess
import sys import sys
import urlparse import urlparse
from wptrunner.update.sync import LoadManifest from wptrunner.update.sync import LoadManifest, UpdateCheckout
from wptrunner.update.tree import get_unique_name from wptrunner.update.tree import get_unique_name
from wptrunner.update.base import Step, StepRunner, exit_clean, exit_unclean from wptrunner.update.base import Step, StepRunner, exit_clean, exit_unclean
@ -364,7 +364,8 @@ class PRDeleteBranch(Step):
class SyncToUpstreamRunner(StepRunner): class SyncToUpstreamRunner(StepRunner):
"""Runner for syncing local changes to upstream""" """Runner for syncing local changes to upstream"""
steps = [LoadManifest, steps = [UpdateCheckout,
LoadManifest,
CheckoutBranch, CheckoutBranch,
GetLastSyncCommit, GetLastSyncCommit,
GetBaseCommit, GetBaseCommit,