Merge issues with CVS

[SUBRAMANIAN, SARAVANAN \(SBCSI\)]

Hi All

We use branches in CVS, When we do merge the conflicted files which are
merged earlier appears again and again.
How to solve this issue.
Example :- A file called  Demo.java merged after resolving conflicts.
When we try to merge Demo1.java , Demo.java also appears how to avoid
this problem.
Please help me out.

Thanks
SARAVANAN SUBRMANIAN
SCM
Centrex Mate


-----Original Message-----
From: address@hidden
[mailto:address@hidden On Behalf Of
address@hidden
Sent: Thursday, March 24, 2005 10:49 AM
To: address@hidden
Subject: Info-cvs Digest, Vol 28, Issue 37


Send Info-cvs mailing list submissions to
        address@hidden

To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.gnu.org/mailman/listinfo/info-cvs
or, via email, send a message with subject or body 'help' to
        address@hidden

You can reach the person managing the list at
        address@hidden

When replying, please edit your Subject line so it is more specific
than "Re: Contents of Info-cvs digest..."


Today's Topics:

   1. Re: Get no mail from log_accum.pl (Rafal Kedziorski)
   2. cvs editors funny (Colm Aengus Murphy)
   3. RE: cvs editors funny (Jim.Hyslop)


----------------------------------------------------------------------

Message: 1
Date: Thu, 24 Mar 2005 09:18:57 +0100
From: Rafal Kedziorski <address@hidden>
Subject: Re: Get no mail from log_accum.pl
To: address@hidden
Message-ID: <address@hidden>
Content-Type: text/plain; charset="us-ascii"

Hi,

it's working now. There was a problem sending mail on our server.


Regards,
Rafal

At 16:16 23.03.2005, Rafal Kedziorski wrote:
>hi,
>
>I want use
>log_accum.pl for get email with changes in our sources.
>I've done this:
>
>- add line in loginfo:
>
>ALL $CVSROOT/CVSROOT/log_accum.pl -u $USER %s
>
>- add line in checkoutlist
>
>
>But after commit I didn't get any email. Only the message:
>
>
>Checking in 
>lib/net/polonium/xmlapi/request/synchronize/SynchronizeMediaRequest_1_0
.java;
>/data/cvs/mmcms/src/lib/net/polonium/xmlapi/request/synchronize/Synchro
nizeMediaRequest_1_0.java,v 
><--  SynchronizeMediaRequest_1_0.java
>new revision: 1.26; previous revision: 1.25
>done
>Processing log script arguments...
>Mailing the commit message to address@hidden (from 
>address@hidden)No mail for rafal
>Checking in lib/net/polonium/xmlapi/response/AbstractBaseResponse.java;
>/data/cvs/mmcms/src/lib/net/polonium/xmlapi/response/AbstractBaseRespon
se.java,v 
><--  AbstractBaseResponse.java
>new revision: 1.8; previous revision: 1.7
>done
>Processing log script arguments...
>Mailing the commit message to address@hidden (from
address@hidden)
>No mail for rafal
>
>
>In CVSROOT/commitlogs are the right files.
>
>Why I didn't get any email?
>
>
>
>Regards
>Rafal
>
>
>_______________________________________________
>
>Info-cvs mailing list
>
>address@hidden
>
>http://lists.gnu.org/mailman/listinfo/info-cvs
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL:
http://lists.gnu.org/pipermail/info-cvs/attachments/20050324/a37d150f/at
tachment.html

------------------------------

Message: 2
Date: Thu, 24 Mar 2005 14:37:28 +0000
From: Colm Aengus Murphy <address@hidden>
Subject: cvs editors funny
To: address@hidden
Message-ID: <address@hidden>
Content-Type: text/plain; charset=us-ascii; format=flowed

Hi folks,

We've come across the following funny when using the cvs editors
feature.
In my workspace I do a "cvs edit" to indicate I am editing a file.
"cvs editors" correctly reports me as an editor.
If I then create another workspace using "cvs co" and run "cvs editors" 
I am no longer listed as an editor of the file.

Another funny is that you can only be listed as an editor of a file once

even though you might be editing the same file in more than one
workspace.

Anyone else come across this ?

Cheers

Colm A


------------------------------

Message: 3
Date: Thu, 24 Mar 2005 10:00:24 -0500
From: "Jim.Hyslop" <address@hidden>
Subject: RE: cvs editors funny
To: "'Colm Aengus Murphy'" <address@hidden>, address@hidden
Message-ID:
        
<address@hidden>
Content-Type: text/plain

Colm Aengus Murphy wrote:
> We've come across the following funny when using the cvs 
> editors feature.
> In my workspace I do a "cvs edit" to indicate I am editing a file.
> "cvs editors" correctly reports me as an editor.
> If I then create another workspace using "cvs co" and run 
> "cvs editors" 
> I am no longer listed as an editor of the file.
Darren Bowles submitted a patch to correct this, on the bug-cvs list,
two
days ago. Is this a good demonstration of statistical clustering, or
what?
:=)

> Another funny is that you can only be listed as an editor of 
> a file once 
> even though you might be editing the same file in more than 
> one workspace.
Well, this one's a bit trickier. The repository does not keep track of
how
many locations you have a workspace checked out (except _maybe_ in the
history file). Seems to me keeping track of which locations you're
editing
and which you aren't would be an administrative nightmare, getting into
situations that could be extremely difficult to correct. For example,
suppose a user checks out a project, issues 'cvs edit' on one or more
files,
then abandons the changes by simply deleting the working copy. In order
to
release the edit, the user would have to re-create the exact same
directory
structure, then issue the 'cvs unedit' command.

-- 
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. ( http://www.leitch.com )
Columnist, C/C++ Users Journal ( http://www.cuj.com/experts )




------------------------------

_______________________________________________
Info-cvs mailing list
address@hidden
http://lists.gnu.org/mailman/listinfo/info-cvs


End of Info-cvs Digest, Vol 28, Issue 37
****************************************