[cvsnt] Re: Missing merge point on files which was initially added on branch

Thomas Bergmann news at hatoka.de
Mon Aug 1 10:26:00 BST 2005


sorry i forgot the version in this posting

w2k and linux versions are
Z:\>cvs -v
Concurrent Versions System (CVSNT) 2.5.01 (Travis) Build 1976

"Bo Berglund" <bo.berglund at system3r.se> wrote in message
news:42d6697b.313496714 at news.cvsnt.org...
> On Thu, 14 Jul 2005 12:16:28 +0200, "Thomas Bergmann" <news at hatoka.de>
> wrote:
> >1. If I add a file (file2.txt in example) initially on branch, then the
> >first mergepoint (from release branch to main branch) is missing.
> >
> >2. A file (file1.txt) is marked as changed, on merge to a second branch
> >but the file is equal as the existing. normally an update resets
> >files marks if nothing is changed, but not in this case.
> >
> If you want an analysis of a problem like this the very least you
> could supply is the actual CVSNT version (server side) you are using.
> And don't state it as "the latest" or something similar. It must be
> like or similar. THat is the only way anyone can analyze
> your problem.
> BTW there was a build or two that did this.....
> /Bo Berglund

More information about the cvsnt mailing list