On Mon, 2006-01-09 at 16:45 +0100, Lele Gaifax wrote:
> David Houghton ha scritto:
> > The strange thing is that there should be no file
> > dev/research/config.xml. If I type cvs co dev, there's no such file in
> > the research subdirectory. This is always the case: changes are being
> > committed to a file which is not under version control in either CVS or
> > Subversion. Could this be a file which someone added to and then removed
> > from CVS between invocations of my cron job? Are commits being performed
> > in the wrong order? Could this be the result of trying to infer what
> > should have been atomic commits in CVS, could CVS do such a thing?
>
> David, can you please try to obtain the very same "cvs log" that tailor
> asks (and of which you should find the exact command line in the .log
> file) and send that to me? Maybe that file was modified in a branch, and
> tailor fails to parse the log.
>
> If, as you suggest, someone added and then removed the file in the CVS
> repo, you should still see two different changesets being applied in the
> svn world. So I doubt this can be the reason.
I've done a little more research at it appears that the problem is that
two successive deletes of the same file were committed to CVS. Here's
some debugging output (tailor with -v and -D):
11:09:54 [I] Changeset "2001-06-18 05:53:30 by stage"
11:09:54 [I] Log message: This file has been consolidated into
the main config file in product/Merm/XXXServer/config/config.xml
11:09:54 [I] /subversion/.sync/hybrid/dev $ cvs
-d :pserver:[EMAIL PROTECTED]:/streamsage/cvsroot
-q update -d -r 1.11 research/config.xml
cvs update: research/config.xml is no longer in the repository
11:09:54 [I] [Ok]
11:09:54 [I] /subversion/.sync/hybrid/dev $ svn remove --quiet
--force research/config.xml
11:09:54 [I] [Ok]
11:09:54 [I] /subversion/.sync/hybrid/dev $ svn commit
--file /tmp/tailorQeOUg7svn research/config.xml
11:09:55 [I] [Ok]
Output stream:
Deleting research/config.xml
Committed revision 5209.
11:09:55 [I] /subversion/.sync/hybrid/dev $ svn propset svn:date
--quiet --revprop --revision 5209 2001-06-18T05:53:30.000000Z
11:09:55 [I] [Ok]
11:09:55 [I] /subversion/.sync/hybrid/dev $ svn propset
svn:author --quiet --revprop --revision 5209 stage
11:09:55 [I] [Ok]
11:09:55 [I] /subversion/.sync/hybrid/dev $ svn update --quiet
--revision 5209
11:09:56 [I] [Ok]
11:09:56 [I]
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
Unrelated changeset deleted.
11:09:59 [I]
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
11:09:59 [I] Changeset "2001-06-18 06:01:26 by stage"
11:09:59 [I] Log message: Removed this file, as everything is
now consolidated into product/Merm/XXXServer/config/config.xml
-- lewis
11:09:59 [I] /subversion/.sync/hybrid/dev $ svn remove --quiet
--force research/config.xml
11:09:59 [I] [Ok]
11:09:59 [I] /subversion/.sync/hybrid/dev $ svn commit
--file /tmp/tailorf3JBuJsvn research/config.xml
11:09:59 [W] [Status 1]
Error stream:
svn: Commit failed (details follow):
svn: '/subversion/.sync/hybrid/dev/research/config.xml' is not
under version control
11:09:59 [C] Couldn't reply changeset
11:09:59 [I] 270 pending changesets in state file
11:09:59 [C] Upstream change application failed
And some messing around with cvs:
[EMAIL PROTECTED] dev]$ cvs rlog -Nr1.10:
dev/research/config.xml
RCS file: /streamsage/cvsroot/dev/research/Attic/config.xml,v
head: 1.12
branch:
locks: strict
access list:
keyword substitution: kv
total revisions: 12; selected revisions: 3
description:
----------------------------
revision 1.12
date: 2001/06/18 06:01:26; author: stage; state: dead; lines:
+0 -0
Removed this file, as everything is now consolidated into
product/Merm/XXXServer/config/config.xml -- lewis
----------------------------
revision 1.11
date: 2001/06/18 05:53:30; author: stage; state: dead; lines:
+0 -0
This file has been consolidated into the main config file in
product/Merm/XXXServer/config/config.xml
----------------------------
revision 1.10
date: 2001/06/14 16:01:44; author: spiegel; state: Exp;
lines: +2 -0
Added valid XML header tags.
=============================================================================
[EMAIL PROTECTED] dev]$ cvs rdiff -r1.10
dev/research/config.xml | head
Index: dev/research/config.xml
diff -c dev/research/config.xml:1.10
dev/research/config.xml:removed
*** dev/research/config.xml:1.10 Thu Jun 14 12:01:44 2001
--- dev/research/config.xml Mon Jan 9 12:04:07 2006
***************
*** 1,88 ****
- <?xml version="1.0"?>
- <!DOCTYPE CONFIGURATION SYSTEM
"../../Common/xml/configuration.dtd">
- <CONFIGURATION>
- <PARAMETER>
No branches are involved. I'm not sure how this situation arose. I
haven't been able to recreate it in experimental CVS repositories, but
I'm just a dabbler in version control systems. Could this have come
about through hand manipulation of the CVS metadata?
David
>
> bye, lele.
> _______________________________________________
> Tailor mailing list
> [email protected]
> http://lists.zooko.com/mailman/listinfo/tailor
_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
