[Top][All Lists]

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

Re: Help merging vendor branch:

From: Derek Robert Price
Subject: Re: Help merging vendor branch:
Date: Thu, 30 Oct 2003 12:02:43 -0500
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030624 Netscape/7.1

Hash: SHA1

Mark D. Baushke wrote:

| If you didn't have such a doxygen_1-3-3 tag, then you might need to use
| the vendor tag from the import (say for example you called it
| doxygen_vendor):
|     cvs co -r b_code_cleanup -d b_code_cleanup MG_HEDGE
|     cd b_code_cleanup
|     cvs up -jyesterday:doxygen_vendor -jdoxygen_1-3-4

This is what I was talking about, except it's -j<tag>:<date>, not the
other way around.

Your original question mentioned merging the original import.  That
doesn't make a whole lot of sense, since a merge from nothing to your
last import into the trunk will attempt to merge files that don't need
it and produce a conflict for every previously existing file.

If you meant that you had a version checked in on the trunk, then
attempted to convert to a vendor branch by importing the next version,
then you may be able to salvage things by tagging the original checkin
of doxygen on the trunk (or using the existing tag if you thought to tag
it originally) and using that as your first merge option.

Or you can resort to Mark's diff/patch suggestion.  A CVS merge is just
a diff/patch anyhow, except you specify two tags instead of directories
as the end points of the diff computation and apply the result
automatically to the workspace.  CVS also puts in nifty conflict markers
for you instead of making you look through *.rej files to resolve
conflicts, of course.

- --
~                *8^)

Email: address@hidden

Get CVS support at <>!
- --
Welcome to the Church of the Holy Cabbage.  Lettuce pray
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Netscape -


reply via email to

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