I was doing some development on a branch off what was the latest
version of our product; let's call it dev-latest-branch. It turns out
that they want to actually implement this on an earlier version of the
software so I did the following:
1. Create a branch tag, dev-older-branch, off the older version
2. cvs update -r dev-older-branch
3. cvs update -j dev-latest-branch
I have found that I have *TONS* of files added after doing the merge.
These files exist in the latest version of the product but they
weren't modified in dev-latest-branch. I thought that cvs was only
supposed to merge changes.
Is there a way to only get my changes from this branch without going
through a lot of manual rigmarole? Unfortunately I didn't make a base
tag for dev-latest-branch. Otherwise I could probably do:
cvs update -j dev-latest-branch-base -j dev-latest-branch
Yes? No?
...Stephen
