Difference: CvsTips (3 vs. 4)

Revision 412 Nov 2007 - TobyCabot

Line: 1 to 1

META TOPICPARENT	name="ProgrammingNotes"

Deleted:

<
<

CVS is the Concurrent Versions System, a file revision control system. It works nicely for distributed development, but is weak in branching and merging. It's by far the most popular version control system in the Open Source world, and is probably second only to MS source safe overall.

http://www.cvshome.org/ - the CVS home page

Line: 19 to 18

- Apply the branch label to the Root: cvs tag -r Root_Example_Branch -b Example_Branch
Remember to do as little work as possible on branches, especially if you expect to merge back to the trunk. Resist the temptation to refactor or "improve" as you go because you'll make merge conflicts more likely if you don't. Make a note of your ideas for improvements and apply them to the trunk after the merge.

Added:

>
>

Misc

http://wimleers.com/blog/cvs-diff-new-files-fakeadd - HOWTO include new files in a patch if you don't have commit privilege.

-- TobyCabot - 03 Apr 2003

View topic | History: r4 < r3 < r2 < r1 | More topic actions...