[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnumed-devel] (no subject)re: reverting
|
From: |
Sebastian Hilbert |
|
Subject: |
Re: [Gnumed-devel] (no subject)re: reverting |
|
Date: |
Wed, 19 Nov 2003 02:23:08 +0100 |
|
User-agent: |
KMail/1.5.4 |
I have a guess here. When one moves files from the main trunk to test-area/foo
and commits there , revisions start at 1.1 again. Once you move it back it
probably continues with previous version in main trunk +1. I have seen this
happen before. My CVS knowledge is very limited though.
Sebastian
On Wednesday 19 November 2003 01:41, David Grant wrote:
> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
> <html>
> <head>
> <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
> <title></title>
> </head>
> <body text="#000000" bgcolor="#ffffff">
> <br>
> <br>
> Karsten Hilbert wrote:<br>
> <blockquote type="cite" cite="address@hidden">
> <blockquote type="cite">
> <pre wrap="">Unfortunately, the cvs doesn't distinguish its own commit
> comments from the rest of the program, so any changes in these areas will
> cause a commit and comment change: much of the commit was new files, and
> gmClinicalRecord, gmDemographicRecord, gmEditArea, gmGP_PastHistory,
> gmGP_Allergies, gmDemographics. The others had no or little code changes.
> </pre>
> </blockquote>
> <pre wrap=""><!---->But they still got committed without a meaningful
> commit message.
> </pre>
> </blockquote>
> Syan, when you said: "the cvs doesn't distinguish its own commit
> comments from the rest of the program, so any changes in these areas
> will cause a commit and comment change"<br>
> <br>
> The "commit changes" you speak of are not added until you actually
> commit. So forget about that. That is not the reason that all
> this files with no changes in them got committed. Somehow you
> "touched" them or edited in some way, and made cvs think there were
> changes.<br> <br>
> What I am curious about is the Revision 1.1 which was make on some
> files in late October... Here's a diff from gmMedDoc.py between 1.11
> and 1.12:<br>
> <br>
> address@hidden business $ cvs diff -r 1.11 gmMedDoc.py<br>
> Index: gmMedDoc.py<br>
> ===================================================================<br>
> RCS file: /cvsroot/gnumed/gnumed/gnumed/client/business/gmMedDoc.py,v<br>
> retrieving revision 1.11<br>
> retrieving revision 1.12<br>
> diff -r1.11 -r1.12<br>
> 39,40c39,40<br>
> < # $Id: gmMedDoc.py,v 1.11 2003/06/27 16:04:13 ncq Exp $<br>
> < __version__ = "$Revision: 1.11 $"<br>
> ---<br>
> > # $Id: gmMedDoc.py,v 1.12 2003/11/17 10:56:34 sjtan Exp $<br>
> > __version__ = "$Revision: 1.12 $"<br>
> 542a543,550<br>
> > # Revision 1.12 2003/11/17 10:56:34 sjtan<br>
> > #<br>
> > # synced and commiting.<br>
> > #<br>
> > # Revision 1.1 2003/10/23 06:02:38 sjtan<br>
> > #<br>
> > # manual edit areas modelled after r.terry's specs.<br>
> > #<br>
> <br>
> The only thing that was different between sjtan's working copy and the
> repository version is this:<br>
> <br>
> > # Revision 1.1 2003/10/23 06:02:38 sjtan<br>
> > #<br>
> > # manual edit areas modelled after r.terry's specs.<br>
> > #<br>
> <br>
> The modification to all the other cvs tags was done during the his
> commit of version 1.12. But what is this 1.1 revision all
> about... It is totally out of order. I'm seeing the same thing
> in other files too, like this one:<br>
> <br>
> address@hidden business $ cvs diff -r 1.2 gmKVK.py<br>
> Index: gmKVK.py<br>
> ===================================================================<br>
> RCS file: /cvsroot/gnumed/gnumed/gnumed/client/business/gmKVK.py,v<br>
> retrieving revision 1.2<br>
> retrieving revision 1.3<br>
> diff -r1.2 -r1.3<br>
> 9,10c9,10<br>
> < # $Id: gmKVK.py,v 1.2 2003/04/19 22:53:46 ncq Exp $<br>
> < __version__ = "$Revision: 1.2 $"<br>
> ---<br>
> > # $Id: gmKVK.py,v 1.3 2003/11/17 10:56:34 sjtan Exp $<br>
> > __version__ = "$Revision: 1.3 $"<br>
> 282a283,290<br>
> > # Revision 1.3 2003/11/17 10:56:34 sjtan<br>
> > #<br>
> > # synced and commiting.<br>
> > #<br>
> > # Revision 1.1 2003/10/23 06:02:38 sjtan<br>
> > #<br>
> > # manual edit areas modelled after r.terry's specs.<br>
> > #<br>
> <br>
> Can someone please explain this to me? I'm curious about this
> Revision 1.1 thing that sneaked in there. Did cvs add the Revision
> 1.3 and Revision 1.1 information after he committed 1.3? or was the
> Revision 1.1 stuff already there when he committed? And how did it
> get there? It's strange because the log doesn't show it:<br>
> <br>
> address@hidden business $ cvs log gmKVK.py<br>
> <br>
> RCS file: /cvsroot/gnumed/gnumed/gnumed/client/business/gmKVK.py,v<br>
> Working file: gmKVK.py<br>
> head: 1.3<br>
> branch:<br>
> locks: strict<br>
> access list:<br>
> symbolic names:<br>
> keyword substitution: kv<br>
> total revisions: 3; selected revisions: 3<br>
> description:<br>
> ----------------------------<br>
> revision 1.3<br>
> date: 2003/11/17 10:56:34; author: sjtan; state: Exp;
> lines: +9 -2<br> <br>
> synced and commiting.<br>
> ----------------------------<br>
> revision 1.2<br>
> date: 2003/04/19 22:53:46; author: ncq; state: Exp;
> lines: +8 -5<br> - missing parameter for %s<br>
> ----------------------------<br>
> revision 1.1<br>
> date: 2003/04/09 16:15:24; author: ncq; state: Exp;<br>
> - KVK classes and helpers<br>
> ===========================================================================
>==<br> <br>
> I'm beginning to wonder if he imported or added to a different
> repository which gave it the Revision 1.1 info in the log. Then the
> gnumed CVS saw this as a change in the source! So it flagged these
> files as having been changed from its repository version. This makes
> sense, and it would explain why the gnumed repository log has no
> information about the change with the comment: "manual edit areas
> modelled after r.terry's specs."<br>
> <br>
> Sjtan, did you import these sources into your own repository before
> commtting them to gnumed cvs?<br>
> <br>
> Someone please enlighten me, I'm very curious about this.<br>
> <br>
> <br>
> Dave<br>
> <br>
> <pre class="moz-signature" cols="72">--
> David J. Grant
> M.A.Sc. Candidate in Electrical Engineering
> a-Si and Integrated Circuits Lab
> University of Waterloo
> Room DC3707
> 519-888-4567 x2872
> <a class="moz-txt-link-freetext"
> href="http://www.eng.uwaterloo.ca/~djgrant";>http://www.eng.uwaterloo.ca/~dj
>grant</a>
>
> </pre>
> </body>
> </html>
- [Gnumed-devel] (no subject)re: reverting, syan tan, 2003/11/18
- Re: [Gnumed-devel] (no subject)re: reverting, Karsten Hilbert, 2003/11/18
- Re: [Gnumed-devel] (no subject)re: reverting, David Grant, 2003/11/18
- Re: [Gnumed-devel] (no subject)re: reverting, Karsten Hilbert, 2003/11/18
- Re: [Gnumed-devel] (no subject)re: reverting, Karsten Hilbert, 2003/11/18
- Re: [Gnumed-devel] (no subject)re: reverting,
Sebastian Hilbert <=
- Re: [Gnumed-devel] (no subject)re: reverting, Karsten Hilbert, 2003/11/18
- Re: [Gnumed-devel] (no subject)re: reverting, Sebastian Hilbert, 2003/11/19
- Re: [Gnumed-devel] (no subject)re: reverting, David Grant, 2003/11/19
- Re: [Gnumed-devel] (no subject)re: reverting, Karsten Hilbert, 2003/11/19