[Home]	[About]
[Screenshots]	[Download]
[News]	[Community]
[Documentation]	[Manual]
[Bugs & Requests]	[Wiki]

/home/tetron/hack/vos/libs/vos/extensions/revcontrol/list3waymerge.hh File Reference

Go to the source code of this file.

Classes

• struct Entry
• struct Change
• struct ListMergeConflict

Functions

• bool operator== (const Entry &x, const Entry &y)
• bool operator!= (const Entry &x, const Entry &y)
• bool operator== (const Change &x, const Change &y)
• bool operator!= (const Change &x, const Change &y)
• void applyChanges (std::deque< Entry > &entries, std::deque< Change > &history)
• void undoChanges (std::deque< Entry > &entries, std::deque< Change > &history)
• void listIt (std::deque< Entry > &entries)
• void pushDelete (std::deque< Change > &history, int pos)
• void pushSet (std::deque< Change > &history, int pos, const std::string &name, const std::string &child)
• void pushInsert (std::deque< Change > &history, int pos, const std::string &name, const std::string &child)
• void diffEntries (std::deque< Entry > &entries, std::deque< Entry > &base_entries, std::deque< Change > &delete_list, std::deque< Change > &insert_list)
• void printChangelist (std::deque< Change > &clist)
• void mergeEntries (std::deque< Entry > &branchA, std::deque< Entry > &branchB, std::deque< Entry > &base_entries, std::deque< Change > &delete_listBtoM, std::deque< Change > &insert_listBtoM, std::deque< ListMergeConflict > &conflicts, bool printstuff=false)

---

Function Documentation

void applyChanges	(	std::deque< Entry > &	entries,
		std::deque< Change > &	history
	)

void diffEntries	(	std::deque< Entry > &	entries,
		std::deque< Entry > &	base_entries,
		std::deque< Change > &	delete_list,
		std::deque< Change > &	insert_list
	)

void listIt

(

std::deque< Entry > &

entries

)

void mergeEntries	(	std::deque< Entry > &	branchA,
		std::deque< Entry > &	branchB,
		std::deque< Entry > &	base_entries,
		std::deque< Change > &	delete_listBtoM,
		std::deque< Change > &	insert_listBtoM,
		std::deque< ListMergeConflict > &	conflicts,
		bool	printstuff = false
	)

bool operator!=	(	const Change &	x,
		const Change &	y
	)			[inline]

Definition at line 86 of file list3waymerge.hh.

bool operator!=	(	const Entry &	x,
		const Entry &	y
	)			[inline]

Definition at line 76 of file list3waymerge.hh.

bool operator==	(	const Change &	x,
		const Change &	y
	)			[inline]

Definition at line 81 of file list3waymerge.hh.

bool operator==	(	const Entry &	x,
		const Entry &	y
	)			[inline]

Definition at line 71 of file list3waymerge.hh.

Referenced by VOS::MsgField::operator!=().

void printChangelist

(

std::deque< Change > &

clist

)

void pushDelete	(	std::deque< Change > &	history,
		int	pos
	)

void pushInsert	(	std::deque< Change > &	history,
		int	pos,
		const std::string &	name,
		const std::string &	child
	)

void pushSet	(	std::deque< Change > &	history,
		int	pos,
		const std::string &	name,
		const std::string &	child
	)

void undoChanges	(	std::deque< Entry > &	entries,
		std::deque< Change > &	history
	)