Forum OpenACS Development: Merge between two branches

Collapse
1: Merge between two branches
Posted by Anny Flores on 06/08/05 08:03 PM
Hi,

Which cvs command I should execute to get the changes from a different branch version.

I have the Evaluation package from oacs-5-2 and I want to get the changes from HEAD , is that possible? or should I do it manually?

Thanks in advance

Collapse
2: Re: Merge between two branches (response to 1)
Posted by Victor Guerra on 06/08/05 08:49 PM
The way to go is
cvs update -j HEAD in the /packages/evaluation/ folder. There cuold be merge conflicts when cvs is merging so pay attention to the log mesages.

Good luck!

Regards,
Victor Guerra.

Collapse
3: Re: Merge between two branches (response to 1)
Posted by Anny Flores on 06/08/05 09:13 PM
Thanks Victor!