-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Sent: Wednesday, September 10, 2003 8:07 PM
To: [EMAIL PROTECTED]
Cc: CVS list
Subject: Re: Comparison of two repositories?
Mark D. Baushke writes:
The '-x CVS' option tells GNU diff to exclude any CVS
Lemke, Michael IZ/HZA-IE5 [EMAIL PROTECTED] writes:
[EMAIL PROTECTED] writes:
Mark D. Baushke writes:
The '-x CVS' option tells GNU diff to
exclude any CVS directories from the
comparison.
If you have lots of RCS keywords turned on,
then you may wish to write a quick
Merging multible branches.
PROBLEM:
I loose my merged branch changes if another branch is merged to the trunk afterward.
QUESTION:
How does CVS merge a branch, if multible branch points exists on the same trunk
version.
DESCRIPTION:
I reproduced the problem like this:
1.1
Hi there,
during a merge (from branch to HEAD) I got the following error message
(concerns a lot of files):
---
...
cvs server: PositionOffset.xml: permission mismatch between 1.1 and 1.1.2.1
cvs server: nonmergeable file needs merge
cvs server: revision 1.1.2.1 from
Hi Guys,
Can somebody suggest me solution to this problem or the forum where I can
put this query ...
Thanx in anticipation .
Regards,
Pervinder Singh Sudan
-Original Message-
From: Pervinder Singh Sudan
Sent: Thursday, September 11, 2003 6:11 PM
To: '[EMAIL
Sorry to spam everyone. After a detailed investigation I found the log message
works correctly using cvs 1.11.5, but I also found that I cannot use log to
identify all changes between two tags. I am trying to identify All changes by
using -- cvs log -rus-1-0-9-78::us-1-0-9-80 -- I have
[EMAIL PROTECTED] writes:
Can any one please explain the behavior for the following tag deletion and
checkout:
I don't see anything strange about deleting the tag so I assume it's the
checkout that has you confused. Although the tag was deleted, it still
exists in the CVSROOT/val-tags file
Christian Schultz Ottosen writes:
The merge of Branch2 results in:
cvs update -P -jBranch2 tekst.txt (in directory
C:\CVSsandbox_SCADA\testmodules\cso\Dir\)
RCS file: /mitarepo/testmodules/cso/Dir/tekst.txt,v
retrieving revision 1.2.2.1
retrieving revision 1.2.4.1
Merging differences
Pervinder Singh Sudan writes:
Can somebody suggest me solution to this problem or the forum where I can
put this query ...
I think you want the CvsGui mailing list:
http://groups.yahoo.com/group/cvsgui/
-Larry Jones
Santa's gonna skip this block for years. -- Calvin
Dickson, Craig writes:
This message is in MIME format. Since your mail reader does not understand
this format, some or all of this message may not be legible.
Please do not send MIME and/or HTML encrypted messages to the list.
Plain text only, PLEASE!
However when I go to commit my changes
Hi Guys,
Can somebody suggest me solution to this problem or the forum where
I can put this query ...
Thanx in anticipation .
Try the cvsgui mailing list:
http://groups.yahoo.com/subscribe/cvsgui
or look at docs here:
http://www.wincvs.org/
HTH,
Geoff
Hi all,
I have a question regarding the entries added to the CVS history file for
tag operations.
The documentation clearly states that only a rtag operation (and not the
normal tag) operation writes a history entry.
Could someone in the know tell me why this decision was made. It seems very
Johannes Kilian writes:
cvs server: PositionOffset.xml: permission mismatch between 1.1 and 1.1.2.1
This indicates that you have enabled the notoriously buggy
PreservePermissions code. Since that has been disabled in recent
releases of CVS, you must either be using a very old release of CVS or
From: Larry Lords [mailto:[EMAIL PROTECTED]
Sent: Thursday, September 11, 2003 9:04 AM
To: [EMAIL PROTECTED]
Subject: Re: cvs log problem
Does anyone know how to identify ALL changes between two tags?
Larry Lords
cvs rdiff -s -rtag1 -rtag2 module
This will give results such as the
I'm running the cygwin 1.11.5 client on Windows 2k sp4.
Got this when I updated today on Windows, after upgrading to 1.11.6
yesterday on the linux RH server (2.4.22 kernel):
D:\acl7\src\clcvs update -d
cvs server: Updating .
P ChangeLog
cvs update: move away ./Makefile; it is in the way
C
I'm running the cygwin 1.11.5 client on Windows 2k sp4.
Btw, upgrading cygwin, which contaains 1.11.6, does not fix the
problem.
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
Kevin Layer writes:
cvs [server aborted]: CHANGE-LOG,v is ambiguous; could mean CHANGE-LOG,v or
change-log,v
CVS was designed for case-sensitive file systems and has never quite
worked entirely correctly on case-insensitive file systems. Client/
server mode where one system is case sensitive
Lots of instances of the following in my repository:
foo,v
Attic/Foo,v
where the Attic file was cvs rm'd years ago and is not used anymore.
If I rename Attic/Foo,v to Attic/Foo_renamed_due_to_cvs_bug,v and cvs
update -d on my Windows box, all is well.
On Thu, Sep 11, 2003 at 05:30:22PM +0200, Martin FUZZEY wrote:
The documentation clearly states that only a rtag operation (and not the
normal tag) operation writes a history entry.
These threads from the list archives are of particular interest:
We have been working on revising an archaic workflow, and a question came up which I
could not resolve with my 6 years of CVS experience.
Would it be possible to pull a set of files from the repository in a _NEGATIVE_ sense?
That is, I want all the files that do NOT have tag X-Y-Z.
All,
I'm having trouble getting cvs history for a module in our repository.
Specifically,
cvs history -n modulename -D Thursday
returns = No records selected.
If I run
cvs history -n modulename or cvs history -on modulename
without the date stamp, I get information that I checked out
21 matches
Mail list logo
