Re: Oak newbie question re. full versioning, branches, merges

2015-01-05 Thread Marcel Reutegger
Hi,

On 03/01/15 00:01, John Gretz jgre...@yahoo.com.INVALID wrote:
Since Oak supports only a single workspace but has capability of full
versioning (and lacks simple versioning), how does full versioning work
in this context? 

it means you can use version related operations that are limited
to a single workspace. E.g. cross workspace operations are not
supported.

Under what circumstances can one create a branch and how would that
branch be merged (given that the merge-related ops of the VersionManager
are not operational in Oak)?

the repository creates a branch automatically, when you restore
a previous version and then perform a check in.

changes from a branch cannot be merged because this is not yet
implemented. see also:
http://jackrabbit.apache.org/oak/docs/differences.html#Versioning

Regards
 Marcel



Oak newbie question re. full versioning, branches, merges

2015-01-02 Thread John Gretz
Hey guys,
Since Oak supports only a single workspace but has capability of full 
versioning (and lacks simple versioning), how does full versioning work in this 
context? Under what circumstances can one create a branch and how would that 
branch be merged (given that the merge-related ops of the VersionManager are 
not operational in Oak)?
Thx!John