Places/Places Branch: Difference between revisions

From MozillaWiki
Jump to navigation Jump to search
No edit summary
 
(24 intermediate revisions by 4 users not shown)
Line 1: Line 1:
== Details ==
== Details ==


*pushlog: http://hg.mozilla.org/projects/places/pushloghtml<br>  
*pushlog: http://hg.mozilla.org/projects/places/pushloghtml<br>  
*waterfall: http://tinderbox.mozilla.org/showbuilds.cgi?tree=Places  
*waterfall: http://tinderbox.mozilla.org/showbuilds.cgi?tree=Places  
*tbpushlog: http://tests.themasta.com/tinderboxpushlog/?tree=Places  
*tbpl: http://tbpl.mozilla.org/?tree=Places  
*hg: ssh://hg.mozilla.org/projects/place/
*hg: ssh://hg.mozilla.org/projects/places/


== Merges  ==
== Merge from mozilla-central ==
 
=== Merge m-c into places ===
<pre>hg pull ssh://hg.mozilla.org/mozilla-central/
<pre>hg pull ssh://hg.mozilla.org/mozilla-central/
hg merge tip
hg merge default
hg commit
hg commit -m "Merge Places and mozilla-central"
hg push </pre>
hg push </pre>  
 
Note that if there are no different changesets with central (nothing to merge), hg merge tip will fail, use ''hg update default'' then. If mozilla central has new heads due to tagged releases, you may have to ''hg push -f'' instead, but '''check heads correctness with ''hg heads'' first'''.
Note that if there are no different changesets with central (nothing to merge), hg merge tip will fail, you can use ''hg update default'' instead.
 
== Current Active Projects<br>  ==
 
Projects currently using the branch<br> Please annotate all the temp changesets.
 
14 Jan 2010: pushing async expiration parts to get talos numbers <br>
 
last good m-c changeset: adbb42ccb494 Marco Bonardo — Merging mozilla-central changes in Places branch


pushed:
== Merge to mozilla-central  ==


0a763fb536bd Marco Bonardo — Bug 520165 - Part15: Fix a bad condition when expiration runs just before an addURI, r=dietrich default tip<br> 49fcbd265b69 Marco Bonardo — Bug 520165 - Part14: Add a maintenance task to print pages limit and run expiration, r=dietrich<br> 659a9207b8b6 Marco Bonardo — Bug 520165 - Part13: New expiration tests, r=mano<br> aedb2d5a5447 Marco Bonardo — Bug 520165 - Part12: fix existing Places tests, r=mano<br> 269041e4933b Marco Bonardo — Bug 520165 - Part11: Fix download manager tests dependancies, r=sdwilsh<br> 8e664ce92e61 Marco Bonardo — Bug 520165 - Part10: Add a new expiration component, r=mano, r=dietrich<br> f54a2f23eb89 Marco Bonardo — Bug 520165 - Part9 (Satchel): fix dependancies, r=dolske<br> 403adabfd1e9 Marco Bonardo — Bug 520165 - Part 9 (Photon): fix dependancies<br> a4cf5aec1bce Marco Bonardo — Bug 520165 - Part 9 (Migration): fix dependancies, r=dietrich<br> 94b1856023bb Marco Bonardo — Bug 520165 - Part9 (libpref): fix dependancies, r=mano<br> 9db7368f1c14 Marco Bonardo — Bug 520165 - Part9: remove old expiration code, r=mano<br> d34f6bb62cb7 Marco Bonardo — Bug 520165 - Part8: Change onPageExpired to onDeleteVisits, r=mano, sr=mconnor<br> 58712dc61811 Marco Bonardo — Bug 520165 - Part7: Provide a new preference to toggle history, r=mano ui-r=faaborg<br>
Follow the procedure to merge from mozilla-central, then finally push the merged changeset to it with:  
<pre>hg push ssh://hg.mozilla.org/mozilla-central/</pre>

Latest revision as of 02:12, 24 May 2011

Details

Merge from mozilla-central

hg pull ssh://hg.mozilla.org/mozilla-central/
hg merge default
hg commit -m "Merge Places and mozilla-central"
hg push

Note that if there are no different changesets with central (nothing to merge), hg merge tip will fail, use hg update default then. If mozilla central has new heads due to tagged releases, you may have to hg push -f instead, but check heads correctness with hg heads first.

Merge to mozilla-central

Follow the procedure to merge from mozilla-central, then finally push the merged changeset to it with: 

hg push ssh://hg.mozilla.org/mozilla-central/
Retrieved from "https://wiki.allizom.org/index.php?title=Places/Places_Branch&oldid=311544"