[GRASS-dev] CVS branch problem

GRASS GIS GRASS GIS developer
1

Hi,

I wanted to backport the v.dissolve column support to the
6.2 release branch, but

bartok:v.dissolve[3553.44] cvs ci -m"backported col support"
cvs commit: Examining .
cvs server: sticky tag `releasebranch_6_2' for file `description.html' is not a branch
cvs server: sticky tag `releasebranch_6_2' for file `v.dissolve' is not a branch
cvs [server aborted]: correct above errors first!

From http://owen.sj.ca.us/rkowen/howto/cvs.html I got that

the tag isn't on the branch (or so) and I tried:

bartok:v.dissolve[3554.45] cvs tag -b -r releasebranch_6_2 releasebranch_6_2
cvs server: Tagging .
W Makefile : releasebranch_6_2 already exists on version 1.1 : NOT MOVING tag to branch 1.1.0.2
W description.html : releasebranch_6_2 already exists on version 1.1 : NOT MOVING tag to branch 1.1.0.2
W v.dissolve : releasebranch_6_2 already exists on version 1.1 : NOT MOVING tag to branch 1.1.0.2

but the problem persists. Suggestions welcome. AFAIR the v.dissolve
was added later to the branch (and hence the mess).

Markus

2

Markus Neteler wrote:

Hi,

I wanted to backport the v.dissolve column support to the
6.2 release branch, but

bartok:v.dissolve[3553.44] cvs ci -m"backported col support"
cvs commit: Examining .
cvs server: sticky tag `releasebranch_6_2' for file `description.html'
is not a branch cvs server: sticky tag `releasebranch_6_2' for file
`v.dissolve' is not a branch cvs [server aborted]: correct above
errors first!

>>From http://owen.sj.ca.us/rkowen/howto/cvs.html I got that
the tag isn't on the branch (or so) and I tried:

bartok:v.dissolve[3554.45] cvs tag -b -r releasebranch_6_2
releasebranch_6_2 cvs server: Tagging .
W Makefile : releasebranch_6_2 already exists on version 1.1 : NOT
MOVING tag to branch 1.1.0.2 W description.html : releasebranch_6_2
already exists on version 1.1 : NOT MOVING tag to branch 1.1.0.2 W
v.dissolve : releasebranch_6_2 already exists on version 1.1 : NOT
MOVING tag to branch 1.1.0.2

but the problem persists. Suggestions welcome. AFAIR the v.dissolve
was added later to the branch (and hence the mess).

Yes. Apparently I added v.dissolve and v.centroids to releasebranch_6_2
as a tag and not a branch. I'm not sure how to fix that.

http://www.psc.edu/~semke/cvs_branches.html

I used something like:
cvs up -j HEAD v.dissolve
cvs tag -r HEAD releasebranch_6_2 v.dissolve
?

Hamish