Hi,
I need to know if I can get the branch name details when trying to get
history information for checkin operation, over X number of days.
Here is what I tried
cvs history -e -a -D 7 Mar 2002
The above command will indicate branch details only for action type
checkout.
Anything missed
hi
try cvs history -c -a -D `date +%Y-%m-%d`
I think it will work fine
Regards
Shishir Singhai
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of
Sharmila Ramesh
Sent: Friday, November 22, 2002 3:13 PM
To: [EMAIL PROTECTED]
Subject: History of checked
Larry Jones wrote:
Most likely, there is at least one file in each of those directories
where that tag is a revision tag rather than a branch tag.
On the spot. There were files in the repository where the branch tag had
for some reason been transformed to version tags. If this was due to
After browsing the list archives I see that this bug has been noted
previously. I have just run into it myself.
CVS client: 1.11.1 running on linux Mandrake
CVS server 1.11.2 on compaq Tru64 alpha
Symptoms: All remote CVS commands hang if -z flag is specified.
Are there any plans to
I've got several remote sites that have slow links and large
checkouts are too slow (for their satisfaction).
Here's my plan:
1) Use cvsup to create a read-only mirror that is local to them.
Update this at least once a day. Prevent checkins here.
2) Create a wrapper around 'cvs checkout' which
Keith Refson writes:
Are there any plans to actually fix this?
It's fixed in the current development version of CVS.
-Larry Jones
I never get to do anything fun. -- Calvin
___
Info-cvs mailing list
[EMAIL PROTECTED]
=?ISO-8859-1?Q?Karl-K=F6nig_K=F6nigsson?= writes:
On the spot. There were files in the repository where the branch tag had
for some reason been transformed to version tags. If this was due to
user error or a freak problem with CVS is hard to say, though user error
is always the main
Chris Sharpe wrote:
I've got several remote sites that have slow links and large
checkouts are too slow (for their satisfaction).
Here's my plan:
1) Use cvsup to create a read-only mirror that is local to them.
Update this at least once a day. Prevent checkins here.
2) Create a
Terrence Enger writes:
I notice that checkout.c, below the comment /* strip the last_component
*/ still uses strdup() instead of xstrdup(). Is this an accedent?
Yes, it is. Thanks for pointing it out.
-Larry Jones
Your gender would be a lot more tolerable if it wasn't so darn cynical!
--
I am new to CVS. I am testing out merging.
When I merged 2 files I got extra lines teling me where the merged lines
where.
Is there any way around this ?
Ex.
The and delimit the merged lines.
#ss
#tt
#ll
#kkk
SRC has been automatically set to /proj/ace/src/
Creating
On Fri, Nov 22, 2002 at 11:35:17AM -0500, MacMunn, Robert wrote:
When I merged 2 files I got extra lines teling me where the merged lines
where.
Is there any way around this ?
The extra lines with and appear only when there are
conflicts in the merged files. They are a feature, not a bug,
On Sat, 2002-11-23 at 03:35, MacMunn, Robert wrote:
I am new to CVS. I am testing out merging.
When I merged 2 files I got extra lines teling me where the merged lines
where.
Is there any way around this ?
This means that the same lines were changed in the two files, and CVS
doesn't
On Fri, 22 Nov 2002, MacMunn, Robert wrote:
I am new to CVS. I am testing out merging.
When I merged 2 files I got extra lines teling me where the merged lines
where.
Is there any way around this ?
Ex.
The and delimit the merged lines.
No, they delimit conflicts. You can't get
Thanks. Looks like merges must be difficult in CVS. A lot of manual work.
-Original Message-
From: Kaz Kylheku [mailto:[EMAIL PROTECTED]]
Sent: Friday, November 22, 2002 12:18 PM
To: MacMunn, Robert
Cc: [EMAIL PROTECTED]
Subject: Re: Merging in CVS
On Fri, 22 Nov 2002, MacMunn, Robert
On Fri, Nov 22, 2002 at 10:10:48AM +0530, Srinivas P Shenoy wrote:
CVS/project which is a super set of project1 project2.
I think you mean that the two old projects were independent of
each other, containing different files; and the new super-project
is to contain all of them (files from p1 +
Thanks. Looks like merges must be difficult in CVS. A lot of manual
work.
Oh, do you know of a configuration management system that can read human
minds?
Basically, two changes have been made to the *same spot*: one in your
work area, and one checked in by someone else. Which change should
It isn't a slick interface. In Clearcase it is the merge tool itself that
gives you the ability to deal with the conflicts easily.
-Original Message-
From: 'Thomas S. Urban' [mailto:[EMAIL PROTECTED]]
Sent: Friday, November 22, 2002 1:27 PM
To: MacMunn, Robert
Cc: [EMAIL PROTECTED]
On Fri, Nov 22, 2002 at 13:17:12 -0500, MacMunn, Robert sent 1.7K bytes:
Not at all. In Clearcase you have a graphical interface where the conflicts
can be taken care of as the merge happens. No manual editting of files.
A nice tool with a graphical interface is still a manual tool. It may
On Fri, Nov 22, 2002 at 12:23:56 -0500, MacMunn, Robert sent 0.9K bytes:
Thanks. Looks like merges must be difficult in CVS. A lot of manual work.
Most of the time, merges happen automatically. Manual intervention is
only required when they can't happen automatically. Conflicts always
take
MacMunn, Robert writes:
Thanks. Looks like merges must be difficult in CVS. A lot of manual work.
Only when there are conflicts (i.e., the same line of code separately
modified by two different developers). In reality, conflicts occur very
rarely.
-Larry Jones
Hello, I'm wondering if you
Not at all. In Clearcase you have a graphical interface where the conflicts
can be taken care of as the merge happens. No manual editting of files.
-Original Message-
From: Thomas S. Urban [mailto:[EMAIL PROTECTED]]
Sent: Friday, November 22, 2002 1:16 PM
To: MacMunn, Robert
Cc: [EMAIL
So use Clearcase if it provides something you can't live without. I'm
only trying to point out that logically, the operations are the same
(the timing may be a little different), e.g:
1 You request an update of local file to newest version in repository
2 CVS will merge new version and local
On Fri, 22 Nov 2002, MacMunn, Robert wrote:
Thanks. Looks like merges must be difficult in CVS. A lot of manual work.
You are jumping to conclusions; read the documentation and work with
CVS merges for a while. There is some manual work in merging, but it's
not in the area where you think it
We have 3 CM tools within the whole comapny. CVS, Perforce, and Clearcase.
Management wants to go with 1 tool. They feel Clearcase is too expensive,
and it can be. I am a Clearcase guy, but know the cost. So, Perforce seems
limited, CVS seems to be able to handle all that we need. I just
On Fri, Nov 22, 2002 at 12:23:56PM -0500, MacMunn, Robert wrote:
Thanks. Looks like merges must be difficult in CVS. A lot of manual work.
Only when both new versions have changed the same area of the
file. That is, if I edit line 100 and you edit line 120, there
won't be a conflict. But if
On Fri, 22 Nov 2002, MacMunn, Robert wrote:
On Fri, Nov 22, 2002 at 12:23:56 -0500, MacMunn, Robert sent 0.9K bytes:
Thanks. Looks like merges must be difficult in CVS. A lot of manual
work.
Most of the time, merges happen automatically. Manual intervention is
only required when
I'm curious if the feedback about how CVS handles merges poorly is
about the automatic merge action or the way conflicts are presented? I'm
guessing the latter. If you'll listen to what people here are saying, I
think you'll find the answer to your question:
- CVS and clear case both do the
Try xxdiff (http://xxdiff.sourceforge.net). It has an option, -U,
which unconflicts a file. It gives you a graphical
click-one-or-the-other display of a files with merge conflicts. I've
found it to be quite useful.
You still have to figure out the relative value of each change, but
fixing that
On Sat, 2002-11-23 at 05:28, MacMunn, Robert wrote:
It isn't a slick interface. In Clearcase it is the merge tool itself that
gives you the ability to deal with the conflicts easily.
Check the various CVS graphical clients - some of them display the
conflicts in merges in a merge tool. It
Thanks
-Original Message-
From: Kaz Kylheku [mailto:[EMAIL PROTECTED]]
Sent: Friday, November 22, 2002 1:44 PM
To: MacMunn, Robert
Cc: [EMAIL PROTECTED]
Subject: Re: Merging in CVS
On Fri, 22 Nov 2002, MacMunn, Robert wrote:
Thanks. Looks like merges must be difficult in CVS. A
[ bring up files for merging as soon as the conflict is detected ]
No, CVS can't do that. Fundamentally, CVS is a command-line tool, and
all that the GUIs (like WinCVS) do is to put a pretty face on it.
By the way, how ClearCase works is that in the *command-line* tool
(cleartool), you have an
From my experience, technically the way CVS performs merges is fine. The
biggest problem has been misunderstanding of how to correctly perform a
merge, and this is a problem you can have with any tool. I've had instances
where someone complained that CVS screwed up a merge, but when I dug a
little
The replacement he's referring to is Subversion. I don't think it's quite
ready for prime time, but it looks like it will be very nice.
Dave
-Original Message-
From: MacMunn, Robert [mailto:[EMAIL PROTECTED]]
Sent: Friday, November 22, 2002 1:54 PM
To: Daniels, Dave F [PCS]
Cc:
[ On Friday, November 22, 2002 at 12:23:56 (-0500), MacMunn, Robert wrote: ]
Subject: RE: Merging in CVS
Thanks. Looks like merges must be difficult in CVS. A lot of manual work.
Three-way merges can be difficult any time there are conflicts. CVS is
no different in this than _any_ other
On Fri, Nov 22, 2002 at 11:16:37AM -0800, Shankar Unni wrote:
[ bring up files for merging as soon as the conflict is detected ]
No, CVS can't do that. Fundamentally, CVS is a command-line tool, and
all that the GUIs (like WinCVS) do is to put a pretty face on it.
By the way, how
It is looking that way to me also and you can't beat the price. A friend of
mine was at the Apache conference this week and says there is a replacement
coming out for CVS.
-Original Message-
From: Daniels, Dave F [PCS] [mailto:[EMAIL PROTECTED]]
Sent: Friday, November 22, 2002 2:43 PM
Donald Sharp wrote:
Be carefull using/working with bitkeeper for those of you who do
development on any other scm system. The license prohibits you
from using bitkeeper and doing development on competitors to bitkeeper.
Bitkeeper's Free Use BKL license http://www.bitkeeper.com/bkl.txt
There is an aspect of ClearCase that makes its merge operations significantly
superior to CVS, which is in the way it identifies the common ancestor of
of a 3-way merge. It considers the results of past merges, not just the
intersection of the branches. The effect is that resolved conflicts
--- Forwarded mail from [EMAIL PROTECTED]
Thanks. Looks like merges must be difficult in CVS. A lot of manual
work.
Oh, do you know of a configuration management system that can read human
minds?=20
Basically, two changes have been made to the *same spot*: one in your
work area, and one
You will seriously miss directory versioning and the ability to reorganize
your source code at will. Depending on your process, you might also miss
the ability to store named attributes on your artifacts. My users also
make heavy use of the graphical version tree browser, which displays
merges.
Hi Eric,
yes you are correct. the second approach which you have told is the one
i think we will have to go for. there are a couple of modules which
are variants of the same code and have different tag history.
i will lose the tag history, but i guess we will have to
live with it..
41 matches
Mail list logo
