ime2224的个人空间 https://blog.eetop.cn/1101565 [收藏] [复制] [分享] [RSS]

空间首页 动态 记录 日志 相册 主题 分享 留言板 个人资料

日志

cvs can't commit files

已有 1009 次阅读| 2014-12-26 11:40 |个人分类:CVS

I cannot commit my changes. CVS tells me:
cvs commit: sticky tag `someTag' for file `blah.txt' is not a branch
What now ?
You have previously updated or checked out the file or module in question using a so called "sticky tag". This happens when you use any of the options found either on the "Sticky options" tab of the Update dialog or the "Checkout options" tab of the Checkout dialog. The only kind of sticky tag that allows you to commit changes based on it is a branch tag (hence the message). Otherwise you will first have to undo the sticky tag. There are several different scenarios for this:
  • The revision you based your modifications on is on the tip of the trunk. This is the easiest case. All you have to do is run the Update command with the "Reset any sticky date/tag/'-k' options" option (aka cvs update -A) turned on. After this you will be able to commit again.
  • The revision you based your modifications on is outdated (i.e. someone else has already committed a newer revision). In this case you have to chose whether you first want to merge in the newer changes (and maybe resolve conflicts produced by this) before committing your own changes on top of these or whether you want your changes to live on on a branch of their own, effectively forking the development.
    In the former case you could simply follow the instructions from the first scenario. The merging will happen when you remove the sticky tag.
    In the latter case instead of resetting the sticky tag you will first have to create the new branch and then update to that new branch before you could commit.
  • The revision you based your modifications on is already on a branch. The steps for this scenario are very similar to the ones above. The only difference is that instead of removing the sticky tags altogether you update to a different one, namely that of the branch your base revision resides on.

点赞

评论 (0 个评论)

facelist

您需要登录后才可以评论 登录 | 注册

  • 关注TA
  • 加好友
  • 联系TA
  • 0

    周排名
  • 0

    月排名
  • 0

    总排名
  • 2

    关注
  • 1

    粉丝
  • 0

    好友
  • 2

    获赞
  • 0

    评论
  • 490

    访问数
关闭

站长推荐 上一条 /1 下一条


小黑屋| 手机版| 关于我们| 联系我们| 隐私声明| EETOP 创芯网
( 京ICP备:10050787号 京公网安备:11010502037710 )

GMT+8, 2025-1-3 18:05 , Processed in 0.023172 second(s), 14 queries , Gzip On, Redis On.

eetop公众号 创芯大讲堂 创芯人才网
返回顶部