Help!
I messed up a merge into a branch and need to roll that entire branch back
to my premerge tag.
I would just use a '-r premerge_tag' to up or get but that is going to make
the working directory sticky to the static tag and won't allow me to commit
the rolled back changes. I would just revert the merge (reversing the -j
args of the original merge) but work has been done in the branch since the
merge which I don't want either (as it was done after a bad merge).
Am I stuck with doing the following?
cvs get -r BRANCH -d B1 mod # Clean get of the tip of the branch
cvs up -r premerge_tag # Letting it stick
cvs -nq up > rollers # See what changed
cvs get -r BRANCH -d B2 mod # Getting another clean tip of the branch
for the commit
# cp the files listed in rollers from B1 to B2
cd B2
cvs ci -m "Rolling back to premerge"
Or is there some admin or update flag that I'm missing? Other ideas?
TIA,
ksb
