[MARMOTTA-40] Merge all branches to default branch

• Type: Sub-task
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 2.6
• Fix Version/s: 3.0-incubating
• Component/s: Build Environment
• Assignee: Sebastian Schaffert
• Reporter: Sebastian Schaffert
• Created: 28/Jan/13 10:51
• Updated: 29/Apr/13 08:39
• Resolved: 21/Feb/13 13:30

Description

Before code importation we should make sure that all relevant branches in the old Mercurial repository are merged back to the default branch and closed so we have the proper code base to start with. Currently, there are the following branches still open:

• clustering
• HTTPPATCH
• ldpath
• LMF 2.4