Closed Bug 580516 Opened 14 years ago Closed 14 years ago

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

Categories

(Firefox :: Sync, defect)

Product:
Firefox
Component:
Sync
Platform:
x86
macOS
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

()

Status:
RESOLVED FIXED

People

(Reporter: mconnor, Assigned: philikon)

Details

(Whiteboard: [qa-]) 

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"
http://hg.mozilla.org/services/fx-sync/rev/4eab6b53d2c5
Assignee: mconnor → philipp
Status: NEW → RESOLVED
Closed: 14 years ago
Resolution: --- → FIXED
Whiteboard: [qa-]
Component: Firefox Sync: Build → Sync
Product: Cloud Services → Firefox
You need to log in before you can comment on or make changes to this bug.