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

VOS::Conflict Struct Reference

#include <versioned.hh>

List of all members.

---

Detailed Description

Definition at line 13 of file versioned.hh.

Public Attributes

• VUtil::vRef< Vobject > vobject
• std::string block
• std::string message
• std::string headversion
• std::string localversion
• std::string mergedversion

---

Member Data Documentation

std::string VOS::Conflict::block

Definition at line 16 of file versioned.hh.

std::string VOS::Conflict::headversion

Definition at line 18 of file versioned.hh.

std::string VOS::Conflict::localversion

Definition at line 19 of file versioned.hh.

std::string VOS::Conflict::mergedversion

Definition at line 20 of file versioned.hh.

std::string VOS::Conflict::message

Definition at line 17 of file versioned.hh.

VUtil::vRef<Vobject> VOS::Conflict::vobject

Definition at line 15 of file versioned.hh.

---

The documentation for this struct was generated from the following file:

• /home/tetron/hack/vos/libs/vos/extensions/revcontrol/versioned.hh