[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Problems merging files from branch to trunk
From: |
Spiro Trikaliotis |
Subject: |
Re: Problems merging files from branch to trunk |
Date: |
Thu, 17 May 2007 17:01:45 +0200 |
User-agent: |
Mutt/1.5.9i |
Hello,
* On Wed, May 16, 2007 at 01:19:42PM -0700 Evil Otto wrote:
> The strange thing is that CVS seems to think the files are already on
> the trunk, and when I try a "cvs up -A" it overwrites the files I've
> been working on with older versions. I have to do "cvs up -r
> MY_BRANCH" to get the current files back. How do I get those files to
> sync up with what's on the trunk?
You want to have a look into the -j option in the manual. Additionally,
I would highly recommend you read the sections on branching and merging,
and try the commands there on some test-repository.
Best regards,
Spiro.
--
Spiro R. Trikaliotis http://opencbm.sf.net/
http://www.trikaliotis.net/ http://www.viceteam.org/