Two of our developers were working on the same area of a particular file at the
same time. The first committed his changes and when the second developer ran
cvs update, conflicts occurred as you would expect. The second developer went
about resolving the conflicts but somehow ended up committing
Yummy! :-) Please go ahead as described!
/Palle
[EMAIL PROTECTED] (Larry Jones) writes:
> I'm considering making some enhancements to the CVSROOT/passwd file
> format and I'd like people's opinions:
Is it possible to get the date of a tag out of cvs? Or is this something
that can be added for new versions?
i.e. "cvs status -v filename" gives me a list of existing tags:
Existing Tags:
sfman_1_73_20 (revision: 1.22.2.24)
Can this be extended to (if asked for wit
Looks good to me. Much needed improvements, too.
-Karl
[EMAIL PROTECTED] (Larry Jones) writes:
> I'm considering making some enhancements to the CVSROOT/passwd file
> format and I'd like people's opinions:
>
> First, I'd like to interpret "*" in the password field as "the system
> password for
On Sun, 28 May 2000, Gerhard Sittig wrote:
> there! Or have a look at how GNU software does it. I take it
> you're talking C code here, which I'm sure of being handled by
> cpp (the preprocessor).
Alas no, its Delphi I'm dealing with, which unfortunately doesn't do
preprocessor stuff :(
On Saturday, May 27, 2000 9:09 AM, Derek Scherger
[SMTP:[EMAIL PROTECTED]] wrote:
> I'm just looking into using cvswrappers to do some simple cleanups on
> some of our files on checkin (using the -t option) but there's a line in
> the html documentation that makes me think I'm SOL:
>
> The cvswra
Is there a way for cvs diff to report only names of changed files
like diff -q ?
I can't figure out what version of diff cvs is using or what options
it can take.
--
David McArthur
[EMAIL PROTECTED]
On Sun, May 28, 2000 at 18:20 +1200, Mark Derricutt wrote:
> The other day I started changing some of my error messages in
> my app to use the format mentioned on the GNU coding standards
> page, i.e.
>
> filename:linenumber: message
>
> But I soon came to the conclusion that as files got edit
On Sun, 28 May 2000, Mark Derricutt wrote:
> On Sun, 28 May 2000, Mark Derricutt wrote:
>
> > Inserting the data is one thing, the other side would be to write some PHP
> > code for a web-based front-end to this log for generating various
>
> Actually, I was just thinking, how does one get the
On Sun, 28 May 2000, Mark Derricutt wrote:
> $ grep -n DebugFmt Main.PAS
> 545: DebugFmt('main.pas:542: starting steamfield manager (%s)',
This is wrong! You should use some magic constants that the compiler
replaces with the real file name and line number. In C, this would go
something like th
On Sun, 28 May 2000, Mark Derricutt wrote:
> Hi, I was wondering if anyone here had ever set something up to store
> there cvs log history in an sql database. I'm looking at doing having the
> following table (most likely postgresql):
Did you look at bonsai:
http://www.mozilla.org/bonsai.html
Hello!
I am trying to use CVS where the repository resides on AFS.
I want to make everyone able to check out the files,
but only trusted people to check in.
However, people without write access can not check out
files because CVS is unable to lock the repository.
this happends with any version of
Hi Alex,
> Since b13, the toolbars location should be saved : I changed in
MainFrm.cpp :
>
> state.LoadState(_T("Bar State"));
>
> The previous string didn't match the one CJLib expected. Since then, it
works better for me. However if I move the docking windows too much,
sometimes it still disapp
On Sun, 28 May 2000, Mark Derricutt wrote:
> Inserting the data is one thing, the other side would be to write some PHP
> code for a web-based front-end to this log for generating various
Actually, I was just thinking, how does one get the name of the current
cvs user? Also, does the filename i
14 matches
Mail list logo
