merge history of branches

masterpinki · Post by **masterpinki** » Fri Dec 15, 2006 9:39 am

For creating updates on releases we usually work on branches and merge the bug fixes later on in one (bigger) merge step into our main development branch. Unfortunately we lose then the file-history of the release branch in our main branch.

Is there a possibility to merge or review the history from our main development trunk? (Using currently version 3.1.2)

Thanks,
Roland

lbauer · Post by **lbauer** » Sat Dec 16, 2006 6:02 pm

Not in the current version of Vault.

I'll log a feature request for this capability, though it may not be possible to implement, especially in cases where two files, each with their own history, have been merged.

masterpinki · Post by **masterpinki** » Mon Dec 18, 2006 4:01 am

Understand that merging history is not easy.

Maybe it's enough to keep the history linked and visualize it with a tree. Then it can be easily browsed without need to merge the history.

Thanks
Roland