Ubuntu Merge-o-Matic

These directories contain the result of the Ubuntu automated merge system, fondly known as the Merge-o-Matic or just "mom". Merges are generated by combining both the Ubuntu and Debian changes since their first common ancestor and leaving any conflicts to be resolved by human hand.

The layout is the same as a Debian FTP pool, so to see the merge for debhelper see the d/debhelper directory and to see the merge for libraw1394 see the libr/libraw1394 directory. In each directory you will find a REPORT file that tells you what the files mean and what to do.

To grab all the relevant files for a merge, a grab-merge.sh script is available. Be sure to run it from a scratch directory as any other contents will be lost.

Status pages showing the outstanding merges for each component are available, choose main, restricted, universe or multiverse.

For some merges, Merge-o-Matic cannot determine the base version for the merge, and you have to perform the merge by hand. These are listed for main, restricted, universe and multiverse.

[ICO]NameLast modifiedSizeDescription

[TXT]HEADER.html22-May-2012 12:24 1.7K 
[DIR]a/25-Aug-2016 04:42 -  
[TXT]addcomment.py25-Aug-2016 12:35 396  
[DIR]b/23-Aug-2016 13:10 -  
[DIR]c/23-Aug-2016 13:10 -  
[DIR]d/25-Aug-2016 10:42 -  
[DIR]e/20-Aug-2016 22:45 -  
[DIR]f/24-Aug-2016 16:44 -  
[DIR]g/25-Aug-2016 10:44 -  
[TXT]grab-merge.sh27-Feb-2009 14:05 2.6K 
[DIR]h/24-Aug-2016 09:41 -  
[DIR]i/21-Aug-2016 17:43 -  
[DIR]j/10-Aug-2016 22:44 -  
[DIR]k/25-Aug-2016 10:45 -  
[DIR]l/22-Aug-2016 09:10 -  
[DIR]liba/24-Aug-2016 22:44 -  
[DIR]libb/21-Jul-2016 02:40 -  
[DIR]libc/24-Aug-2016 13:41 -  
[DIR]libd/10-Jul-2016 08:09 -  
[DIR]libe/06-Aug-2016 03:40 -  
[DIR]libg/22-Aug-2016 08:12 -  
[DIR]libh/15-Aug-2015 10:09 -  
[DIR]libi/24-Aug-2016 15:41 -  
[DIR]libj/03-Aug-2016 11:12 -  
[DIR]libk/19-Aug-2016 19:33 -  
[DIR]libl/15-Jun-2016 12:41 -  
[DIR]libm/12-Aug-2016 05:12 -  
[DIR]libn/20-Jun-2016 10:11 -  
[DIR]libp/17-Jul-2016 05:12 -  
[DIR]libq/06-Jul-2016 13:11 -  
[DIR]libr/24-Aug-2016 18:46 -  
[DIR]libs/21-Aug-2016 10:40 -  
[DIR]libu/13-Jun-2016 10:40 -  
[DIR]libv/19-Aug-2016 16:43 -  
[DIR]libw/14-Jul-2016 05:10 -  
[DIR]libx/22-Aug-2016 11:11 -  
[DIR]m/24-Aug-2016 22:45 -  
[TXT]main-manual.html25-Aug-2016 12:05 9.6K 
[   ]main-manual.json25-Aug-2016 12:05 3.0K 
[IMG]main-now.png25-Aug-2016 12:46 5.9K 
[IMG]main-trend.png25-Aug-2016 12:46 7.0K 
[TXT]main.html25-Aug-2016 12:53 274K 
[   ]main.json25-Aug-2016 12:53 149K 
[TXT]multiverse-manual.html25-Aug-2016 12:08 1.6K 
[TXT]multiverse-manual.html.test16-Jul-2015 21:04 1.6K 
[   ]multiverse-manual.json25-Aug-2016 12:08 2  
[IMG]multiverse-now.png25-Aug-2016 12:46 5.7K 
[IMG]multiverse-trend.png25-Aug-2016 12:46 6.9K 
[TXT]multiverse.html25-Aug-2016 12:05 6.0K 
[   ]multiverse.json25-Aug-2016 12:05 1.6K 
[DIR]n/19-Aug-2016 19:35 -  
[DIR]o/25-Aug-2016 10:46 -  
[DIR]p/25-Aug-2016 10:46 -  
[DIR]q/19-Aug-2016 19:36 -  
[DIR]r/25-Aug-2016 12:43 -  
[TXT]restricted-manual.html25-Aug-2016 12:05 1.6K 
[TXT]restricted-manual.html.test16-Jul-2015 21:02 1.6K 
[   ]restricted-manual.json25-Aug-2016 12:05 2  
[IMG]restricted-now.png25-Aug-2016 12:46 5.3K 
[IMG]restricted-trend.png25-Aug-2016 12:46 6.5K 
[TXT]restricted.html25-Aug-2016 12:53 2.2K 
[   ]restricted.json25-Aug-2016 12:53 2  
[DIR]s/24-Aug-2016 18:54 -  
[TXT]stats.txt25-Aug-2016 12:46 38M 
[DIR]t/23-Aug-2016 18:46 -  
[   ]tomerge-main25-Aug-2016 12:53 30K 
[   ]tomerge-main-manual25-Aug-2016 12:05 847  
[   ]tomerge-multiverse25-Aug-2016 12:05 470  
[   ]tomerge-multiverse-manual25-Aug-2016 12:08 0  
[   ]tomerge-restricted25-Aug-2016 12:53 0  
[   ]tomerge-restricted-manual25-Aug-2016 12:05 0  
[   ]tomerge-universe25-Aug-2016 12:05 63K 
[   ]tomerge-universe-manual25-Aug-2016 12:08 485  
[DIR]u/19-Aug-2016 19:36 -  
[TXT]universe-manual.html25-Aug-2016 12:08 6.1K 
[TXT]universe-manual.html.test16-Jul-2015 21:04 28K 
[   ]universe-manual.json25-Aug-2016 12:08 1.9K 
[IMG]universe-now.png25-Aug-2016 12:46 5.7K 
[IMG]universe-trend.png25-Aug-2016 12:46 6.6K 
[TXT]universe.html25-Aug-2016 12:05 590K 
[TXT]universe.html.new25-Aug-2016 13:05 580K 
[   ]universe.json25-Aug-2016 12:05 337K 
[DIR]v/23-Aug-2016 19:43 -  
[DIR]w/24-Aug-2016 12:43 -  
[DIR]x/15-Aug-2016 23:13 -  
[DIR]y/18-Aug-2016 02:43 -  
[DIR]z/24-Aug-2016 12:43 -