detect a merge

2003-08-11 Thread Pedro Salazar
Greetings,

I made some merges in my project module but I didn't log with a suitable
message on it saying that it was a merge from a specific branch in a
specific revision. Can CVS track if specific revision was created by a
merge from a branch? Or how could I know that?

For instance, I'm using viewcvs+cvsgraph also to show graphically the
workflow of the revisions. But I'm unable to see "lines" showing the
merges...

Thanks,
Pedro Salazar-



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: detect a merge

2003-08-14 Thread Larry Jones
Pedro Salazar writes:
> 
> I made some merges in my project module but I didn't log with a suitable
> message on it saying that it was a merge from a specific branch in a
> specific revision. Can CVS track if specific revision was created by a
> merge from a branch? Or how could I know that?

CVS doesn't track merges.  If you want to know about them, it's up to
you to track them (typically via log messages and/or tags).

-Larry Jones

Oh yeah?  You just wait! -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


RE: detect a merge

2003-08-14 Thread Dickson, Craig
Title: RE: detect a merge





Yes the expressions are configurable. Look in your cvsgraph.conf file.


-Original Message-
From: William Deegan([EMAIL PROTECTED] consultant) [mailto:[EMAIL PROTECTED]]
Sent: Monday, August 11, 2003 11:27 AM
To: Dickson, Craig
Cc: [EMAIL PROTECTED]
Subject: Re: detect a merge



Dickson, Craig wrote:
> CvsGraph v1.4.0 has the ability to graphically show merges if you tag 
> the branch and then the trunk (or other branch) after the merge with tag 
> names that match particular regular expressions.
Are these regular expressions configurable?
If not what are the patterns to match?


Thanks,
Bill



> 
> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Sent: Sunday, August 10, 2003 8:56 PM
> To: [EMAIL PROTECTED]
> Cc: [EMAIL PROTECTED]
> Subject: Re: detect a merge
> 
> 
> Pedro Salazar writes:
>  >
>  > I made some merges in my project module but I didn't log with a suitable
>  > message on it saying that it was a merge from a specific branch in a
>  > specific revision. Can CVS track if specific revision was created by a
>  > merge from a branch? Or how could I know that?
> 
> CVS doesn't track merges.  If you want to know about them, it's up to
> you to track them (typically via log messages and/or tags).
> 
> -Larry Jones
> 
> Oh yeah?  You just wait! -- Calvin
> 
> 
> ___
> Info-cvs mailing list
> [EMAIL PROTECTED]
> http://mail.gnu.org/mailman/listinfo/info-cvs
> 



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


RE: detect a merge

2003-08-14 Thread Dickson, Craig
Title: RE: detect a merge





CvsGraph v1.4.0 has the ability to graphically show merges if you tag the branch and then the trunk (or other branch) after the merge with tag names that match particular regular expressions.

-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Sunday, August 10, 2003 8:56 PM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: Re: detect a merge



Pedro Salazar writes:
> 
> I made some merges in my project module but I didn't log with a suitable
> message on it saying that it was a merge from a specific branch in a
> specific revision. Can CVS track if specific revision was created by a
> merge from a branch? Or how could I know that?


CVS doesn't track merges.  If you want to know about them, it's up to
you to track them (typically via log messages and/or tags).


-Larry Jones


Oh yeah?  You just wait! -- Calvin



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs