Re: Merging a branch with the main trunk.

[Derek R. Price]

address@hidden wrote:

> Hi,
> I'm using winCVS (1.3.4.3 beta 4 (local Build 3)).
> I have a branch "test_branch" with changes on files that was "branched out"
> from the main trunk.
> I also add new folders and files to this test_branch.
>
> When I'm trying to merge test_branch into the main trunk, the changed files
> are merged ok, but the new folders and files don't "merge" into the main
> trunk. Are new files in test_branch supposed to get added into the main
> trunk with the merge? Or how are these new files from the test_branch
> supposed to be added into the main trunk?

They should merge correctly.  It possible they didn't get added to the correct
branch initially.  There are also some issues with specifying dates with the
branch tags during merges.  You might search the mailing list archives as this
comes up a lot or perhaps try the cvs manual online at cvshome.org .

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden         CollabNet ( http://collab.net )
--
Needing someone is like needing a parachute. If he isn't there
the time you need him, chances are you won't be needing him again.
        - Scott Adam's _Dilbert_