Mercurial > hg > easyhg
diff src/connectionitem.h @ 516:2981d2defa61
Introduce a graphical representation for merge from a closed to an open branch (half a connection item)
author | Chris Cannam |
---|---|
date | Thu, 20 Oct 2011 12:04:47 +0100 |
parents | b9c153e00e84 |
children | 533519ebc0cb |
line wrap: on
line diff
--- a/src/connectionitem.h Thu Oct 20 11:36:49 2011 +0100 +++ b/src/connectionitem.h Thu Oct 20 12:04:47 2011 +0100 @@ -50,12 +50,14 @@ void setParent(ChangesetItem *p) { m_parent = p; } void setChild(ChangesetItem *c) { m_child = c; } void setChild(UncommittedItem *u) { m_uncommitted = u; } + void setMergedBranch(QString mb) { m_mergedBranch = mb; } private: Type m_type; ChangesetItem *m_parent; ChangesetItem *m_child; UncommittedItem *m_uncommitted; + QString m_mergedBranch; }; #endif // CONNECTIONITEM_H