RE: merge mode for XML
It helps me to think of a plain ASCII text file source (C,java,perl etc) as a markup language where a newline is the only tag. To extend the delta generation of a more structured markup language, such as XML, probably would require knowledge of that syntax by the diff program. A quick an dirty approach may be to prefix all opening tags with a newline, suffix all closing tags with a newline, and then remove all blank lines unless inside a tag (in and among CDATA); essentially run it through an xml equiv of cb(1) or indent(1). --@@ ~ DavidC No State shall convert a liberty into a privilege, license it, and charge a fee therefore. ~ Murdock v. Pennsylvania, 319 US 105, US Supreme Court, 1943. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Thursday, April 25, 2002 6:24 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: Re: merge mode for XML [ On Thursday, April 25, 2002 at 16:10:37 (-0500), Sean Hager wrote: ] Subject: merge mode for XML Is there a merge mode or merge algorithm that works well for XML files? Doesn't diff3 work well enough? XML files are more or less just text, right? If the tags are all on separate lines, then regardless of whether content is changed, or tags are changed, diff3 will do the right thing. -- Greg A. Woods +1 416 218-0098; [EMAIL PROTECTED]; [EMAIL PROTECTED]; [EMAIL PROTECTED] Planix, Inc. [EMAIL PROTECTED]; VE3TCP; Secrets of the Weird [EMAIL PROTECTED] ___ 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
nit [was RE: Segmentation Fault (was Re: CVS sticky information ignored on import)]
Just a little nit: if you end the line with a | you can drop the \ find . -name Entries | xargs grep /-kb/ \ | sed -e s|CVS/Entries:/|| -e s|/[^/]*/[^/]*/-kb/.*|| \ | xargs cvs -d $CVSROOT admin -kb find . -name Entries | xargs grep /-kb/ | sed -e s|CVS/Entries:/|| -e s|/[^/]*/[^/]*/-kb/.*|| | xargs cvs -d $CVSROOT admin -kb ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Trouble using edit -c command
If you don't wanna hassle installing cygwin you can get native unix utilities for NT here (http://unxutils.sourceforge.net) or here (http://www.wzw.tu-muenchen.de/~syring/win32/UnxUtils.html); I've been using them for a year or so and am quite satisfied. All that is required subject to memory fade is to download a .zip file and extract into a dir in your PATH /subject to memory fade --@@ ~ DavidC If no information or return is filed, [the] Internal Revenue Service cannot assess you. -- Gary Makovski, Special IRS Agent, testifying under oath in U.S. v. Lloyd www.taxax.org -Original Message- From: Noel Yap [mailto:[EMAIL PROTECTED]] Sent: Thursday, March 21, 2002 6:27 AM To: Eric Gambardella; [EMAIL PROTECTED] Subject: Re: Trouble using edit -c command --- Eric Gambardella [EMAIL PROTECTED] wrote: Server side : CVS NT (on windows NT 4 neither unix nor linux I am sorry ... therefore no patch command available...) Client Side : WinCVS 1.3 (on windows 2000) This software was for us one of the best product that is why we decided to install it on a real server and to deploy WinCVS on 4 PC's. I am not used to the open source projects... I am really sorry if I don't know how to patch the server :-( You could install Cygwin and get the benefits of the Unix commands. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE:'Ryan Speed' english text only?
How bout finding another listserver that supports spam filtering? -Original Message- From: Vishal Jain [mailto:[EMAIL PROTECTED]] Sent: Tuesday, March 19, 2002 11:22 AM To: 'Daniels, David'; 'Ryan Speed'; 'cvsInfo' Subject: RE: english text only? Guys, how do we control who is subscribed? Like I am subscriber I can start putting spam! Anyone can subscribe to our list, so disallowing from external sources will not work, as the spammer can become member and spam. They may flood the list before admin can take them out from the list. But yes! Spam is becoming a much bigger issue here and we need to do something for this. One bet is to disallow all the mails that are not in normal character set, but that will limit even the normal subscribers from japan/russia and other countries that have different character set. There gotta be a way to clear up this mess. Vishal Jain ILX Systems NY -Original Message- From: Daniels, David [mailto:[EMAIL PROTECTED]] Sent: Tuesday, March 19, 2002 1:59 PM To: 'Ryan Speed'; 'cvsInfo' Subject: RE: english text only? Agreed. We can't seem to get the list managers to take action, though. -Original Message- From: Ryan Speed [mailto:[EMAIL PROTECTED]] Sent: Tuesday, March 19, 2002 12:51 PM To: 'cvsInfo' Subject: RE: english text only? It seems to be a trend lately, I'm on a few lists that get spammed with this bullshit. I think the best bet would be to disallow mail from people who aren't subscribed to the list. ryan -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] On Behalf Of Eric Siegerman Sent: March 19, 2002 10:38 AM To: cvsInfo Subject: Re: english text only? On Tue, Mar 19, 2002 at 07:15:12PM +0100, Leif Hanack wrote: i'm new to this mailing-list and i'm wondering myself why i receive mails with strange characters in it. i guess it is japanese or stuff like that. It's spam. The rest of us don't want it either! nevertheless, how can i get rid of it? I wish I knew... -- | | /\ |-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / Outlook not so good. That magic 8-ball knows everything! I'll ask about Exchange Server next. - Anonymous ___ 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 ___ 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 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: CVS-GUI tool
GNU (free) tool http://winmerge.sourceforge.net/ I haven't used it enough to give a review. --@@ ~ DavidC If no information or return is filed, [the] Internal Revenue Service cannot assess you. -- Gary Makovski, Special IRS Agent, testifying under oath in U.S. v. Lloyd www.taxax.org -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Thursday, March 14, 2002 2:17 PM To: [EMAIL PROTECTED] Subject: CVS-GUI tool Hi, Is there any GUI-tool to use CVS in which conflicts can be solved easily. Like there in VSS (Visual Source Safe) I'm facing a problem of commiting files having conflicts with their older versions, as some another user has made changes. Please reply me at [EMAIL PROTECTED] ___ 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: avoid ^M when committing to Unix based repository
I'd recomend vim - it can be used on both windoze unix www.vim.org Let the editor war begin :-) -Original Message- From: Stephen Leake [mailto:[EMAIL PROTECTED]] Sent: Monday, March 11, 2002 4:40 AM To: [EMAIL PROTECTED] Subject: Re: avoid ^M when committing to Unix based repository Mika Lehtonen [EMAIL PROTECTED] writes: Hi! I'm using WinCvs version 1.2. The repository is located in a Unix machine. When I have edited some lines the lines edited has the ^M added after being comitted back to the repository. You have to use an editor that knows not to use DOS line endings. Most programmer's editors can be configured that way. -- -- Stephe ___ 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: CVS and Jar files: Should you import Jar into the Repository? Why or why not
With CVS and non-diff-able, non-patch-able files we're talking about using a tool that's not even remotely suitable for the job at hand. We're not talking about something which happens to have a narrow flat part on the end of a handle and which just happens to more or less fit in the slot of a screw head, and which can be twisted by hand to more or less manipulate the screw. We really are talking instead about hammering machine screws in with the handle of a soldering iron! Plugged in and up to temperature (or was that implied) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: [WINCVS 1.2]cvs login
I had the same problem, although I'm using the .rhosts method. There is a file on your client machine named Root in the CVS dir under the dir you are using as working dir. Press F2 (in wincvs) and an explorer window will pop up, pointing to the CVS dir. The file Root has the path to the repository, in my case: davec@pmdbdev:/home/ipmdsbat/cvsroot davec is the user on the pmdbddev machine wherein the repo resides, and is the name that gets pasted into the file $Log$, which is what, I presume, you want. --@@ ~ DavidC The Biggest Game In Town - http://www.wces.org/html_files/burien.html Finally, America will begin to see the staggering wealth our own city, county, state, and federal governments hold in secret accounts. If these hidden assets - that the AMERICAN PEOPLE own - can be liberated from government agencies, we can see a virtual end to property and income tax. Sound impossible? Then you haven't heard Walter Burien exposing the Comprehensive Annual Financial Report (CAFR) scam. -Original Message- From: Guillaume Denry [mailto:[EMAIL PROTECTED]] Sent: Sunday, February 17, 2002 6:40 AM To: [EMAIL PROTECTED] Subject: [WINCVS 1.2]cvs login When i make a cvs login with the GUI, I have *always* name1 as login, but my CVSROOT defined in admin, preferences is :pserver:name2@... name1 was the first login I entered when I had installed wincvs but it's impossible to me to delete it... and wincvs uses it to login. help me please ___ 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: VSS to CVS
If you want non-cygwin versions of rm chmod see: http://unxutils.sourceforge.net/ From the readme (http://www.laine.org:8080/cvs/vss2cvs/ReadMe.txt): *Don't* install cygwin's cvs.exe, though, unless you like specifying your CVSROOT as, eg, :local:/cygdrive/f/cvsroot, instead of :local:f:/cvsroot. Also, don't install cygwin's perl - it insists on using a strange notation for directories that only other Cygwin applications can understand. Instead, install Activeperl, available at http://www.activeperl.com --@@ ~ DavidC The Biggest Game In Town - http://www.wces.org/html_files/burien.html Finally, America will begin to see the staggering wealth our own city, county, state, and federal governments hold in secret accounts. If these hidden assets - that the AMERICAN PEOPLE own - can be liberated from government agencies, we can see a virtual end to property and income tax. Sound impossible? Then you haven't heard Walter Burien exposing the Comprehensive Annual Financial Report (CAFR) scam. -Original Message- From: Matt Riechers [mailto:[EMAIL PROTECTED]] Sent: Monday, February 18, 2002 7:31 AM To: Nick A Edwards Cc: [EMAIL PROTECTED] Subject: Re: VSS to CVS Nick A Edwards wrote: I am looking for a utility which will allow me to converts a Microsoft Visual Source Safe (6.0) to CVS (currently 1.0.6). I need to make sure that historic versions are also taken. vss2cvs may be what you want (I have never used it). The first hit via google yielded http://www.laine.org:8080/cvs/vss2cvs/ -Matt ___ 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
xml in excel [was RE: using files with .xls and .doc in CVS]
This probably is not the best argument for people who wish to store binaries in CVS, though. In my case, I would *love* to not have .xls or .doc files in my repository. So far, the farthest I've pushed is to get people off .xls and onto .xml ( w/ custom schema/stylesheets ). I'm interested in doing this... Are you using excel? I can't seem to find how to rd/wr to xml with excel. And the bit about style sheets... do you have any pointers? --@@ ~ DavidC Our schools have been scientifically designed to prevent over-education from happening...The average American [should be] content with their humble role in life, because they're not tempted to think about any other role. ~ William Harris, U.S. Commissioner of Education, 1889 ___ 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: Automatting cvs retrieval using Windows NT/2000 at command
This is based on my dealing with AT under NT 4, so caveat emptor... Check the permission of the user ID under which the AT scheduler is running; if it is system (presuming you repo is across the wire) then change it to something else as the system user doesn't have network access. Note future password changes to this user id must be changed manually. To test your environment under AT you can use unix style redirection: at 10:00 c:\path\batfile c:\path\file.log 21 where c:\path\batfile.bat contains: set Note you cannot put dos primatives (built-in commands) directly in the AT command. -Original Message- From: Michael Stopper [mailto:[EMAIL PROTECTED]] Sent: Thursday, February 14, 2002 7:57 AM To: [EMAIL PROTECTED] Subject: Automatting cvs retrieval using Windows NT/2000 at command A search of existing threads didn't reveal anything useful on this so here we go: I've got my build process completely automated via Ant (including checkout, tagging, etc.) and can kick that off at will from a command prompt on NT/2000. However, if I put the call to start ant in a batch file and have the at scheduler kick it off, I get the following back from cvs on the client: cvs [checkout aborted]: could not find out home directory Which home directory is it looking for and why doesn't it need it when the batch file is running normally under DOS?? Any help would be appreciated. Thanks. -- - Michael Stopper Senior Principal / SPS Technical Architect American Management Systems, Inc. 4114 Legato Road Fairfax, Virginia 22033 703.227.6646 Office 703.227.4696 FAX mailto:[EMAIL PROTECTED] ___ 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
username in CVSROOT going unheeded in winCVS
I'm using the .rhost method for CVS with winCVS (W2K). Problem: The username seems to be unheeded, i.e. when I examine the log portion of the modified file it indicates that ipmds* (see below) was the author of the change rather than davec%. My CVSROOT within the winCVS tool is shown as :ext:davec@pmdbprod:/home/ipmds/cvsroot I've also tried remove the :ext: and there is no difference. Under unix (HP/UX) it seems to work correctly i.e. the authorship tracks the username specifed in the CVSROOT environment variable. *ipmds: is the username under which the CVS server is running i.e. the login shell %davec: is my user id under W2K Does any have any idea how I can rectify this? --@@ ~ DavidC 'The Biggest Game In Town' Finally, America will begin to see the staggering wealth our own city, county, state, and federal governments hold in hidden and secret accounts and assets. If these assests - that the AMERICAN PEOPLE own - can be liberated from government agencies, we can see a virtual end to property and income tax. Sound impossible? Then you haven't heard Walter Burien exposing the Comprehensive Annual Financial Report scam. http://www.wces.org/html_files/burien.html ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: reserved checkout
pardon my abject ignorance on all of this... But could you use uuencode and uudecode? The deltas may be *HUGE* but it might be worth a lookit. --@@ ~ DavidC The real truth of the matter is, and you and I know, that a financial element in the large centers has owned the government of the U.S. since the days of Andrew Jackson. History depicts Andrew Jackson as the last truly honorable and incorruptible American president. ~ President Franklin Delano Roosevelt, November 23, 1933 in a letter to Colonel Edward Mandell House -Original Message- From: Matthias Kienle [mailto:[EMAIL PROTECTED]] Sent: Friday, February 01, 2002 12:04 AM To: Greg A. Woods Cc: [EMAIL PROTECTED] Subject: Re: reserved checkout [ On Thursday, January 31, 2002 at 10:34:52 (+0100), Matthias Kienle wrote: ] Subject: reserved checkout What do I wrong? Don't use reserved checkouts with CVS -- CVS is the Concurrent Versions System! I know cvs is a concurrent version system, but a new requirement comes up in our department to use in future only one version system. The other version system administrated binary files like word, excel and powerpoint. CVS (and other version systems too) can not merge binary files after more than one edit from several editors of the same version. The other version system can do reserved checkouts but it runs on a windows server and has no command line. In a first test we used the editors and watcher function of cvs, but the test shows us it is not enough. I must often merge by hand two versions and I can say I hate it. I am a linuxer and I would hate it to explain my manager that cvs does not support reserved checkouts for binary files. I control all web pages, server configuartions and the total source code in a cvs repository. I love my command line for cvs and I love my CVS. I know I am sitting between two chairs. Matthias ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
