GitHub - joliebig/featurehouse_fstmerge

Branches Tags

Name		Name	Last commit message	Last commit date
Latest commit History 77 Commits
AutoWikiBrowser		AutoWikiBrowser
BitPim		BitPim
CruiseControl_NET		CruiseControl_NET
DrJava		DrJava
Eraser		Eraser
FireIRC_IRC_Client		FireIRC_IRC_Client
Freecol		Freecol
GenealogyJ		GenealogyJ
JFreeChart		JFreeChart
JabRef		JabRef
Jmol		Jmol
NASA_worldwind		NASA_worldwind
PMD		PMD
Process_Hacker/rev2147-2158		Process_Hacker/rev2147-2158
RSS_Bandit		RSS_Bandit
SQuirrel_SQL		SQuirrel_SQL
SpamBayes		SpamBayes
Stack		Stack
StackRenaming		StackRenaming
StackRenaming2		StackRenaming2
Stack_python		Stack_python
Tests		Tests
Wicd		Wicd
bug_right		bug_right
eXe		eXe
emesene/rev1286-1505		emesene/rev1286-1505
evaluation/jEdit		evaluation/jEdit
iFolder		iFolder
iText		iText
jEdit		jEdit
matplotlib		matplotlib
wicd		wicd
README.TXT		README.TXT
csharp_projects_preparation.txt		csharp_projects_preparation.txt
python_projects_preparation.txt		python_projects_preparation.txt

Repository files navigation

This folder contains all examples that we used to evaluate the semistructured merge
approach. In total we evaluated 24 software systems written in three different languages
(csharp, java, and python).

csharp:
  AutoWikiBrowser
  CruiseControl.NET
  Eraser
  FireIRC IRC Client
  iFolder
  NASA WorldWind
  Process Hacker
  RSS Bandit
java:
  DrJava
  Freecol
  GenealogyJ
  iText
  JabRef
  jEdit
  JFreeChart
  Jmol
  PMD
  SQuirreL SQL
python:
  BitPim
  emesene
  eXe
  matplotlib
  SpamBayes
  Wicd

Each software system has one or more merge scenarios (revisions) that we used for evaluation.
Each revision has three folders for merging and a revision (extension .revisions) file with the
merge order.