John --
I've never really worked with branches but since no one else has
answered you, I'll have a crack at it. I think the idea here is to make
your working copies be on the DTM_EXP branch. Branches are created in
the CVS repository, not in your working copy. Once your working copy is
on the CVS branch, you can pretty much work normally, updating and
committing your stuff and all of your stuff will go to the branch. When
the branch is merged back to the main branch, you switch your working
copy back to the main branch. I think that your method may make
updating difficult because you'll be updating from the main branch and
not DTM_EXP. This may not be a consideration if you are the only one
working on those modules.
Anyway, to switch your working copies over to the DTM_EXP branch. In
the xml-xalan directory:
cvs update -d -r DTM_EXP
This switches your working copies over. After this, just operate
normally, making changes, updates, and commits. After the branch is
merged back:
cvs update -d -A
I noticed that on some of the sql extensions, you've made changes since
the DTM_EXP branch was created. To merge these changes in to your
working copy (which still has a sticky tag for DTM_EXP):
cvs update -d -j latest-revision
HTH,
Gary
John Gentilin wrote:
>
> Help,
>
> I am looking into porting the SQL code from the
> DOM to the DTM model and I want to make sure
> that I really know how Branching and Merging work
> before I make a mess in the source tree.
>
> So here I go
>
> I retrieved a fresh copy of Xalan from /home/cvs
> cvs checkout :ext:xxxxx:/home/cvs xml-xalan
>
> then I did a merge of the DTM_EXP code so I
> went into the xml-xalan director and executed
> cvs -d -j DTM_EXP
>
> now when I check in, if the DTM_EXP branch still exists, I
> check in the code using
> cvs ci -r DTM_EXP
>
> otherwise if the DTM_EXP has already been merged, I
> just do a normal commit ??
>
> See any problems here ??
>
> Thanks
> JohnG
