[Top][All Lists]

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

Problems merging files from branch to trunk

From: Evil Otto
Subject: Problems merging files from branch to trunk
Date: 16 May 2007 13:19:42 -0700
User-agent: G2/1.0

I've been working with some files that are in a branch.  I want to
move those files to the trunk.  Doesn't seem like it should be so
hard, does it.

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?

reply via email to

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