cvs

Can CVS and Subversion be set to ignore whitespace in merging?

不羁的心 提交于 2019-12-03 14:59:15
问题 CVS and Subversion both have a handy merge feature so that when you update a source file that you have modified, it merges in changes that others have made on the same file. However, if your changes and the other ones are incompatible - generally if you have both changed the same parts of the code - it will create a conflict. Both stretches of source code will be included into the merged file and you need to manually sort out which changes to keep. All fine so far. My problem is that some of

What's the best CVS client for Windows? [closed]

十年热恋 提交于 2019-12-03 14:45:18
问题 As it currently stands, this question is not a good fit for our Q&A format. We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion. If you feel that this question can be improved and possibly reopened, visit the help center for guidance. Closed 8 years ago . We're currently using WinCVS but it's slow and has no merge dialog. I'm looking for something like Eclipse's Team Synchronize (so

autotools: force make not to rebuild configure/Makefile

北城余情 提交于 2019-12-03 13:53:55
I have a project with autotools: automake, autoconf. I want to prohibit make from remaking files configure , Makefile.in , etc; just to do compile job. Some of files are edited by hand, and I know that I should not to do this. (Or the project was updated from CVS with all generated files stored in CVS). But at the moment I have no correct version autotools installed. What must be modification times of this files (which must be newer/older): aclocal.m4 configure.in confdb/ax_prefix_config_h.m4 Makefile.am Makefile.in Makefile configure config.status Or: what sequence of touch commands must I do

How do you rename a branch in CVS?

扶醉桌前 提交于 2019-12-03 11:56:42
If you've named a branch in CVS incorrectly, or the name originally chosen becomes inappropriate, how do you change it to something else? A related question is How do you rename a branch in CVS without admin access? . The trick to this is using one of CVSs' more obscure admin commands, -N. It is a two stage process, effectively copy then remove. Firstly, you create a branch with the correct name that references the original branch name. Secondly, you delete the original branch name. Assume you have a file "File.txt" that is currently branched "bad _ branch". You'd like the branch to be called

How to get a list of tags created in CVS repository?

谁都会走 提交于 2019-12-03 10:52:15
Are there any CLI commands that can be used to get a list of Tags that have been created on a branch or head of a module within a specified time frame? What I briefly need is a list of Tags and the date when they were created. Given following parameters Module Name Branch Name (or :: HEAD) Start Date End Date Thomas I just learned: cvs status -v Lists all tags and braches for each and any file together with the revision it belongs to. You could work from there ... Salman A. Kagzi One can list tags or branches present in a module using the following command. This is something picked up from

Ghostscript postscript pswrite is encoding text

匿名 (未验证) 提交于 2019-12-03 09:52:54
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: Why is Ghostscript pswrite encoding my text in its output? Consider the following MWE: %!PS-Adobe-3.0 %%Title: mwe.ps %%Pages: 001 %%BoundingBox: 0 0 595 842 %%EndComments %%Page: 1 1 %%PageBoundingBox: 0 0 595 842 0 0 1 setrgbcolor 0 0 595 842 rectfill 1 0 0 setrgbcolor 247 371 100 100 rectfill /Times-Roman findfont 72 scalefont setfont newpath 247 300 moveto (Chris) show showpage Saving this MWE to file and viewing in GSview will display a blue page with red square and my name underneath. Now run this file through Ghostscript 9.06 with the

How do I identify what branches exist in CVS?

情到浓时终转凉″ 提交于 2019-12-03 08:28:14
问题 I have a legacy CVS repository which shall be migrated to Perforce. For each module, I need to identify what branches exist in that module. I just want a list of branch names, no tags. It must be a command line tool, for scripting reasons. For example (assuming there is a cvs-list-branches.sh script): $ ./cvs-list-branches.sh module1 HEAD dev_foobar Release_1_2 Release_1_3 $ 回答1: As a quick hack:) The same stands true for rlog. cvs log -h | awk -F"[.:]" '/^\t/&&$(NF-1)==0{print $1}' | sort -u

organize project and specify directory for object files in Makefile

删除回忆录丶 提交于 2019-12-03 07:55:12
Here are my two questions: I am now learning to manage my code with CVS, and I just want to make a repository for my C++ files, Makefile and bash and python scripts only, not the object files and executables. So I made several subdirectories under my project directory: src, bin, scripts, results and data. I put C++ files and Makefile under ~/myproject/src, Bash and Python scripts under ~/myproject/scripts and object and executables under ~/myproject/bin. I am hoping only the files under src and scripts will be updated via CVS. I wonder how you organize your projects? Just hope to follow some

Move a file in CVS without resetting the revision number

陌路散爱 提交于 2019-12-03 06:37:18
Lately I've be moving source files around in our source tree. For example placing a bunch of files into a common assembly. I've been doing this my deleting the file from CVS and then adding it again in the new spot. The problem is the revision number of the file resets back to 1.1. Is there some simple way to move things without having the number reset. I probably should have mentioned that I don't have access to the repository so anything that requires that doesn't help me but it might help others. There is no way to move files around with client-only commands. You need access to the servers

How do I revert a big change in CVS?

一个人想着一个人 提交于 2019-12-03 05:36:37
问题 One of my colleagues has totally messed up the contents of a directory in our main CVS repository. I need to just revert the whole module to the state it was in at the end of last year. What's the CVS command to do this please? He has added and removed hundreds of files, so a simple "copy over files from old checkout and commit" isn't enough. I have RTFM and STFW, and I tried this: cvs co modulename # Note no -P option cvs up -jHEAD -jMAIN:2008-12-30 modulename But that doesn't work - the new