need a better way to merge from fx-sync to mozilla-central

RESOLVED FIXED

Status

RESOLVED FIXED
8 years ago
8 years ago

People

(Reporter: mconnor, Assigned: philikon)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

(Whiteboard: [qa-])

(Reporter)

Description

8 years ago
Primary goal here is to make it easier for us to do versioned merges.  1.4.2 is rsn, and we'd like to push that to trunk ASAP, but the process is...imperfect.

Ideally this is a script that uses a maintained filemap to do the hg convert operation.

https://bugzilla.mozilla.org/show_bug.cgi?id=571902#c83 is the basic path, but we should be able to make this a simple, repeatable operation:

> merge_to_trunk -sync-tag 1.4.2 -central-branch default -m "merge Sync 1.4.2 to trunk"
(Reporter)

Comment 1

8 years ago
http://hg.mozilla.org/services/fx-sync/rev/4eab6b53d2c5
Assignee: mconnor → philipp
Status: NEW → RESOLVED
Last Resolved: 8 years ago
Resolution: --- → FIXED

Updated

8 years ago
Whiteboard: [qa-]
You need to log in before you can comment on or make changes to this bug.