English 中文(简体)
Does an Eclipse CVS merge appear in the log view of a file?
原标题:

I m not new to the Branch/Merge idea, but I m new to CVS. I have a sample file that I have brached off of the main trunk, and have made non-conflicting edits to both the branch and the main.

When I go to Merge, however, the process leaves me with all of my changes in a file representing the latest revision of the Main trunk. When I commit this file, the "log" for the file in SmartCVS shows me that the changes have been committed, but it doesn t signify that the branch has been brought back into the Main trunk.

Will I actually see this in the log view, or is the notion of a merge something that has to be represented in tags or check-in comments?

Thanks!
IVR Avenger

问题回答

CVS does not track merges automatically. In order to do this you will have to adopt your own comment and/or tagging scheme.

In my experience we made sure everyone who merged added comments to indicate where the merge had come from. It was labourious.





相关问题
Use the commit message in a CVS pre-commit hook

Is it possible to use the commit message in a pre-commit hook in CVS? The CVS server is running remotely, and I access it using pserver. Ideally, I want to allow the commit if the files pass the ...

Using CVS to #ifdef my changes

I have a large project that has many changes not yet checked in. I want to check them in but have them only take effect when a certain symbol is #define d CVS does have the ability to format diffs ...

Netbeans CVS - existing repo - existing working copy

I m using Netbeans to develop with Drupal. I m trying to let Netbeans get drupal core and modules from the repository on drupal.org to my local working copy. Problem is: I already have a working ...

Does an Eclipse CVS merge appear in the log view of a file?

I m not new to the Branch/Merge idea, but I m new to CVS. I have a sample file that I have brached off of the main trunk, and have made non-conflicting edits to both the branch and the main. When I ...

Tips on upgrading CVS to git/hg?

We still use CVS, I use git and hg for my personal use though I m still a novice at both, but I realize they re much more modern and better, faster, distributed, etc. It s just everyone is so ...

Get local cvs comment history when committing file/s in emacs

I often commit files with similar cvs comment but not in a single operation. I would like to able to bring up previous comments I ve used in a previous commit when I am in the process of writing a ...

热门标签