[Top][All Lists]

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

Re: merging the same version again and again and again and again and ...

From: Jim Hyslop
Subject: Re: merging the same version again and again and again and again and ...
Date: Thu, 13 Apr 2006 23:19:58 -0400
User-agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)

Hash: SHA1

Harald Dunkel wrote:
> Sorry, I missed to mention that I have this problem only for a
> few files. All files in my directory had been merged between
> 2 branches (!= HEAD) several times. Most files are silently
> skipped on the second merge. Only a few files became "dirty"
> somehow.
>>By the way, the better list for this type of question is
> Sorry, I did not knew this mailing list. But isn't this
> unpredictable behavior a bug, anyway?

*If* it truly is unpredictable, then yes, it may be a bug. What you're
observing may be perfectly predictable if we understand the entire
context in which it's happening.

Let's have a closer look at the files that suffer from this. Is it the
same files every time you merge, or is it a different set of files each
time? Do these files have anything in common, such as (but not limited
to): location? size? presence or lack of RCS keywords such as $Id$?
keyword expansion mode, i.e. -k option (binary or text)?

After the second merge and before committing, examine the output of 'cvs

Can you consistently reproduce the problem? If so, can you provide us
instructions on how to reproduce it in our own repositories?

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org


reply via email to

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