[Top][All Lists]

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

Re: Major change in conflict handling between 1.12.9 and 1.12.13?

From: Stephanie Seibt
Subject: Re: Major change in conflict handling between 1.12.9 and 1.12.13?
Date: Fri, 02 Jun 2006 10:44:55 +0200
User-agent: Thunderbird (Windows/20060308)

Hi Mark,

Mark D. Baushke schrieb:
Hash: SHA1

Stephanie Seibt <address@hidden> writes:

here is my test case:

1) cvs update -j last_join_tag -j BRANCHNAME >logfile 2>&1
2) content of logfile:
   RCS file: /cvs-repository/path_to_file/file,v
   retrieving revision 1.2
   retrieving revision
   Merging differences between 1.2 and into file
   rcsmerge: warning: conflicts during merge

As I do not actually have your file,v available as a test case, this
does not help very much.

file revision 1.2
     my @r = (q$Revision: 1.2 $ =~ /\d+/g);

file revision 1.2.10
     my @r = (q$Revision: $ =~ /\d+/g);

file after join:
<<<<<<< file
     my @r = (q$Revision: 1.5 $ =~ /\d+/g);
     my @r = (q$Revision: $ =~ /\d+/g);

3) content of CVS/Entries:
   /file/1.5/Result of merge+Fri Jun  2 08:02:40 2006//
4) cvs -n update file shows nothing (is cvs-1.12.13 for Windows)

And is the contents of the CVS/Entries file unchanged after this
step #4 operation?

the content is unchanged

5) cvs-1.11.17 -n update shows (also Windows client)
   C file

What dose 'cvs-1.12.13 version' output? (i.e., what is the the server
revision of CVS)? It would also be good to know the server hardware and
operating system type and any special configurations that went into the
server versio n of cvs.

Are you able to give me any further details about the configuration of
the cvs 1.12.13 you are using?

I thought I did it in my first mail

Environment: remote server cvs-1.12.9 (Debian-patch, should be equal to cvs-1.12.13)
pserver access
client cvs-1.12.13 for Windows (downloaded from

output of cvs-1.12.13 version is
Client: Concurrent Versions System (CVS) 1.12.13 (client)
Server: Concurrent Versions System (CVS) 1.12.9 (client/server)

the server is Debian GNU/Linux 3.1

Hope this helps, Stephanie

Sadly, not yet. Until an unless I can understand what is happening, I am
not able to fix it.

        -- Mark
Version: GnuPG v1.4.3 (FreeBSD)


Greetings, Stephanie

reply via email to

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