[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Moving branch to trunk

From: Ed Swierk
Subject: Moving branch to trunk
Date: Tue, 01 Apr 2003 17:39:15 -0800
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.3) Gecko/20030314

A long time ago, we started a new branch that has since become the main development line. A few changes occurred on the trunk as well but that line has effectively died out.

Now I would like to merge everything from the branch into the trunk, ignoring any changes made in the trunk since the branch was created and removing any files in the trunk that are not present in the branch. I understand that cvs update -j does the merge, but I would like to know if there is anything I should do first to make it proceed smoothly. Ideally there should be no conflicts at all, and the end result should be that the trunk is identical to the branch (modulo RCS keywords).

What would happen if I cvs remove'd all the files in the trunk before merging from the branch?


reply via email to

[Prev in Thread] Current Thread [Next in Thread]