Electronics & Programming

develissimo

Open Source electronics development and programming

  • You are not logged in.
  • Root
  • » PHP
  • » [PHP-DEV] CVS Repository Corruption [RSS Feed]

#1 Dec. 7, 2005 08:57:02

William A.
Registered: 2009-11-02
Reputation: +  0  -
Profile   Send e-mail  

[PHP-DEV] CVS Repository Corruption


Two weeks ago;

ext/pcre/config0.m4

was added by duplicating ext/pcre/config.m4,v directly in the CVS repository.

Unfortunately this breaks every historical checkout, due to the now duplicate
existance of config0.m4 and config.m4, causing duplicate builds of the pcre
extention.

Of course, if one wants to do this in order to preserve history, it's still
essential to remove all prior tags from the new ,v file - to avoid exactly
this sort of duplicate checkout -by tag-. Of course checkouts by date would
still check out duplicate files.

And of course nobody wants the true history concealed by removing the old,
now removed file from Attic/. So the patch to the true config0.m4,v is
attached for someone to modify this directly in cvs. Note this is specific
to today's untagged state, and within days this patch would become invalid
when config0.m4,v is tagged with new, non- config.m4,v tags.

Bill--- config0.m4,v-orig 2005-12-07 00:53:37.000000000 -0800
+++ config0.m4,v 2005-12-07 00:54:08.000000000 -0800
@@ -1,219 +1,6 @@
head 1.38;
access;
-symbols
- php_5_1_1:1.36.2.1
- php_5_1_0:1.36.2.1
- php_4_4_2RC1:1.29.2.7.2.1
- php_5_1_0RC6:1.36.2.1
- php_5_1_0RC5:1.36
- php_5_1_0RC4:1.36
- php_4_4_1:1.29.2.7.2.1
- php_5_1_0RC3:1.36
- php_5_1_0RC2:1.36
- php_4_4_1RC1:1.29.2.7.2.1
- PRE_NEW_OCI8_EXTENSION:1.36
- php_5_1_0RC2_PRE:1.36
- php_5_0_5:1.32.2.2
- php_5_0_5RC2:1.32.2.2
- php_5_0_5RC1:1.32.2.1
- php_5_1_0RC1:1.36
- BEFORE_UNICODE_MERGE:1.36
- PHP_5_1:1.36.0.2
- php_5_1_0b3:1.35
- php_4_4_0:1.29.2.7
- php_4_4_0RC2:1.29.2.7
- php_5_1_0b2:1.35
- php_4_4_0RC1:1.29.2.7
- php_5_1_0b1:1.35
- PHP_4_4:1.29.2.7.0.2
- php_5_0_4:1.32
- php_4_3_11:1.29.2.5
- php_5_0_4RC2:1.32
- php_4_3_11RC2:1.29.2.5
- php_4_3_11RC1:1.29.2.5
- php_5_0_4RC1:1.32
- php_5_0_3:1.32
- php_4_3_10:1.29.2.5
- php_5_0_3RC2:1.32
- php_4_3_10RC2:1.29.2.5
- php_5_0_3RC1:1.32
- php_4_3_10RC1:1.29.2.5
- PRE_NEW_VM_GEN_PATCH:1.32
- php_5_0_2:1.32
- php_4_3_9:1.29.2.5
- php_5_0_2RC1:1.32
- php_4_3_9RC3:1.29.2.5
- php_4_3_9RC2:1.29.2.5
- php_5_0_1:1.32
- php_5_0_1RC2:1.32
- php_4_3_9RC1:1.29.2.5
- php_5_0_1RC1:1.32
- PHP_5_0:1.32.0.2
- php_5_0_0:1.32
- php_4_3_8:1.29.2.5
- PHP_4_3_7:1.29.2.5.0.2
- php_5_0_0RC4:1.32
- php_5_0_0RC3:1.32
- php_5_0_0RC3RC2:1.32
- php_4_3_7:1.29.2.5
- php_5_0_0RC3RC1:1.32
- php_4_3_7RC1:1.29.2.5
- php_5_0_0RC2:1.32
- php_5_0_0RC2RC2:1.32
- php_4_3_6:1.29.2.5
- php_5_0_0RC2RC1:1.32
- php_4_3_6RC3:1.29.2.5
- php_4_3_6RC2:1.29.2.5
- php_4_3_6RC1:1.29.2.5
- php_4_3_5:1.29.2.5
- php_4_3_5RC4:1.29.2.5
- php_5_0_0RC1:1.32
- php_5_0_0RC1RC2:1.32
- php_5_0_0RC1RC1:1.32
- php_4_3_5RC3:1.29.2.5
- php_5_0_0b4:1.32
- php_5_0_0b4RC1:1.32
- php_4_3_5RC2:1.29.2.5
- php_4_3_5RC1:1.29.2.5
- php_5_0_0b3:1.32
- php_5_0_0b3RC2:1.32
- php_5_0_0b3RC1:1.32
- php_4_3_4:1.29.2.3
- php_5_0_0b2:1.32
- php_4_3_4RC3:1.29.2.3
- php_5_0_0b2RC1:1.32
- php_4_3_4RC2:1.29.2.3
- php_4_3_4RC1:1.29.2.3
- php_4_3_3:1.29.2.3
- php_4_3_3RC4:1.29.2.3
- php_4_3_3RC3:1.29.2.3
- BEFORE_ARG_INFO:1.32
- php_4_3_3RC2:1.29.2.3
- php_5_0_0b1:1.32
- php_4_3_3RC1:1.29.2.1
- BEFORE_FD_REAPPLY:1.29.2.1
- php_4_3_2:1.29.2.1
- PHP_4_3_2:1.29.2.1.0.2
- php_4_3_2RC4:1.29.2.1
- BEFORE_FD_REVERT:1.29.2.1
- php_4_3_2RC3:1.29.2.1
- php_4_3_2RC2:1.29.2.1
- php_4_3_2RC1:1.29.2.1
- php_4_3_1:1.29
- PHP_4_3_1:1.29.0.8
- PHP_4_3_0:1.29.0.6
- PHP_5_0_dev_before_13561_fix:1.29
- PHP_4_3_before_13561_fix:1.29
- PHP_4:1.29.2.1.0.6
- php_4_3_0:1.29
- php_4_3_0RC4:1.29
- php_4_3_0RC3:1.29
- php_4_3_0RC2:1.29
- php_4_3_0RC1:1.29
- PHP_4_3:1.29.0.2
- php_4_3_0pre2:1.29
- php_4_3_0pre1:1.28
- php_4_3_0_dev_zend2_alpha3:1.28
- php_4_2_3:1.26.2.1
- php_4_2_3RC2:1.26.2.1
- new_apache_hooks:1.28.0.2
- php_4_2_3RC1:1.26.2.1
- dev/:1.28
- php_4_2_2:1.26
- PHP_4_2_2:1.26.0.4
- php_4_3_0_dev_zend2_alpha2:1.27
- php5_5_0:1.27
- php_4_3_0dev:1.27
- php_4_3_0_dev_zend2_alpha1:1.27
- php_4_2_1:1.26
- php_4_2_1RC2:1.26
- php_4_2_1RC1:1.26
- php_4_2_0:1.26
- php_4_2_0RC4:1.26
- php_4_2_0RC3:1.26
- php_4_2_0RC2:1.26
- php_4_2_0RC1:1.26
- PHP_4_2_0:1.26.0.2
- php_4_1_2:1.25
- php_4_1_1:1.25
- ChangeLog:1.26
- php_4_1_0:1.25
- php_4_1_0RC5:1.25
- php_4_1_0RC4:1.25
- php_4_1_0RC3:1.25
- php_4_1_0RC2:1.25
- php_4_1_0RC1:1.25
- php_4_0_7RC3:1.25
- php4:1.25
- POST_SUBST_Z_MACROS:1.25
- PRE_SUBST_Z_MACROS:1.25
- php_4_0_7RC2:1.25
- php_4_0_7RC1:1.25
- PHP_4_0_7:1.25.0.2
- PRE_TSRM_MERGE_PATCH:1.25
- php_4_0_6:1.23
- php_4_0_6RC4:1.23
- php_4_0_6RC3:1.23
- php_4_0_6RC2:1.23
- php_4_0_6RC1:1.23
- PHP_4_0_6:1.23.0.2
- php_4_0_5:1.22
- php_4_0_5RC8:1.22
- php_4_0_5RC7:1.22
- php_4_0_5RC6:1.22
- php_4_0_5RC5:1.22
- php_4_0_5RC4:1.22
- php_4_0_5RC3:1.22
- php_4_0_5RC2:1.22
- php_4_0_5RC1:1.22
- PHP_4_0_5:1.22.0.2
- php_4_0_4pl1:1.20
- php_4_0_4pl1RC2:1.20
- php_4_0_4pl1RC1:1.20
- php_4_0_4REL:1.20
- php_4_0_4RC6:1.20
- php_4_0_4RC5:1.20
- php_4_0_4RC4:1.20
- php_4_0_4RC3:1.20
- php_4_0_4:1.20.0.2
- php_4_0_3:1.20
- php_4_0_3RC2:1.20
- php_4_0_3RC1:1.20
- php_4_0_2:1.20
- php_4_0_2RC1:1.20
- PRE_FILE_COMPILE_API_CHANGE:1.20
- php_4_0_1pl1:1.20
- php_4_0_1:1.20
- php_4_0_1RC2:1.20
- php_4_0_1RC:1.20
- php_4_0_0:1.20
- php_4_0RC2:1.20
- php_4_0RC1:1.18
- php_4_0b4pl1:1.17
- php_4_0b4:1.17
- php_4_0b4_rc1:1.17
- BEFORE_SAPI_POST_PATCH_17_FEB_2000:1.17
- BEFORE_SAPIFICATION_FEB_10_2000:1.17
- BEFORE_PRE_SHUTDOWN_REVERSE_PATCH:1.17
- PRE_ISSET_TYPE:1.17
- PRE_LIBZEND_TO_ZEND:1.15
- PRE_USED_RETURN_VALUE_PATCH:1.15
- php_4_0b3:1.15
- php_4_0b3_RC5:1.15
- php_4_0b3_RC4:1.15
- php_4_0b3_RC3:1.15
- php_4_0b3_RC2:1.15
- before-sapi-split:1.12
- php_4_0b2:1.9
- php_4_0b2-2:1.9
- php_4_0b2-1:1.9
- BEFORE_NEW_OPERATOR_FIX:1.9
- newoperator:1.9.0.2
- BEFORE_BIG_SYMBOL_CHANGE:1.9
- php_4_0b1:1.9
- BEFORE_REMOVING_AI_COUNT_FINAL_STEP:1.8
- BEFORE_REMOVING_GC_STEP1:1.8
- BEFORE_PHP4_APACHE_MODULE_CHANGE:1.1;
+symbols;
locks; strict;
comment @# @;--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit:http://www.php.net/unsub.php

Offline

#2 Dec. 7, 2005 10:04:43

Jani T.
Registered: 2009-11-02
Reputation: +  0  -
Profile   Send e-mail  

[PHP-DEV] CVS Repository Corruption


Not that we will patch the repository files, but why do you care?
You actually use some old release branch? :)

--Jani

On Wed, 7 Dec 2005, William A. Rowe, Jr. wrote:Two weeks ago;

ext/pcre/config0.m4

was added by duplicating ext/pcre/config.m4,v directly in the CVS repository.

Unfortunately this breaks every historical checkout, due to the now duplicate
existance of config0.m4 and config.m4, causing duplicate builds of the pcre
extention.

Of course, if one wants to do this in order to preserve history, it's still
essential to remove all prior tags from the new ,v file - to avoid exactly
this sort of duplicate checkout -by tag-. Of course checkouts by date would
still check out duplicate files.

And of course nobody wants the true history concealed by removing the old,
now removed file from Attic/. So the patch to the true config0.m4,v is
attached for someone to modify this directly in cvs. Note this is specific
to today's untagged state, and within days this patch would become invalid
when config0.m4,v is tagged with new, non- config.m4,v tags.

Bill--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit:http://www.php.net/unsub.php

Offline

#3 Dec. 7, 2005 10:11:25

Edin K.
Registered: 2009-11-02
Reputation: +  0  -
Profile   Send e-mail  

[PHP-DEV] CVS Repository Corruption


Jani Taskinen wrote:
>
> Not that we will patch the repository files, but why do you care?
> You actually use some old release branch? :)

I think that we should try to preserve the possiblity to checkout an old
version of PHP directly from the CVS.

Edin

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit:http://www.php.net/unsub.php

Offline

#4 Dec. 7, 2005 10:13:46

Jani T.
Registered: 2009-11-02
Reputation: +  0  -
Profile   Send e-mail  

[PHP-DEV] CVS Repository Corruption


On Wed, 7 Dec 2005, Edin Kadribasic wrote:Jani Taskinen wrote:Not that we will patch the repository files, but why do you care?
You actually use some old release branch? :)I think that we should try to preserve the possiblity to checkout an old
version of PHP directly from the CVS.It's a bit late to say that now..we've moved lot more files around than
just this one. Or have we? (good memory, just short :)

If you're comfortable patching the file, feel free. I don't care as long
as it won't break HEAD or PHP_5_1 branches.

--Jani

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit:http://www.php.net/unsub.php

Offline

#5 Dec. 7, 2005 10:27:35

Marcus B.
Registered: 2009-11-02
Reputation: +  0  -
Profile   Send e-mail  

[PHP-DEV] CVS Repository Corruption


Hello Jani,

the solution is correct. And btw just another reason to switch to svn.
Without the patch the old branches magically inherit the new file just as
we could change the past.

best regards
marcus

Wednesday, December 7, 2005, 11:13:10 AM, you wrote:

> On Wed, 7 Dec 2005, Edin Kadribasic wrote:

>>
>> Jani Taskinen wrote:
>>>
>>> Not that we will patch the repository files, but why do you care?
>>> You actually use some old release branch? :)
>>
>> I think that we should try to preserve the possiblity to checkout an old
>> version of PHP directly from the CVS.

> It's a bit late to say that now..we've moved lot more files around than
> just this one. Or have we? (good memory, just short :)

> If you're comfortable patching the file, feel free. I don't care as long
> as it won't break HEAD or PHP_5_1 branches.

> --Jani




Best regards,
Marcus

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit:http://www.php.net/unsub.php

Offline

#6 Dec. 7, 2005 10:49:05

William A.
Registered: 2009-11-02
Reputation: +  0  -
Profile   Send e-mail  

[PHP-DEV] CVS Repository Corruption


Jani Taskinen wrote:Not that we will patch the repository files, but why do you care?
You actually use some old release branch? :)In case I wasn't clear, or the patch wasn't clear, this is -every- historical
checkout that's broken. Including those in the past month.

> If you're comfortable patching the file, feel free. I don't care as long
> as it won't break HEAD or PHP_5_1 branches.

ROFL - now that's funny!

Bill

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit:http://www.php.net/unsub.php

Offline

#7 Dec. 7, 2005 10:58:17

Rasmus L.
Registered: 2009-11-02
Reputation: +  0  -
Profile   Send e-mail  

[PHP-DEV] CVS Repository Corruption


Marcus Boerger wrote:the solution is correct. And btw just another reason to switch to svn.
Without the patch the old branches magically inherit the new file just as
we could change the past.I have applied the patch. SVN has its own set of problems.

-Rasmus

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit:http://www.php.net/unsub.php

Offline

#8 Dec. 8, 2005 03:11:02

William A.
Registered: 2009-11-02
Reputation: +  0  -
Profile   Send e-mail  

[PHP-DEV] CVS Repository Corruption


Rasmus Lerdorf wrote:Marcus Boerger wrote:the solution is correct. And btw just another reason to switch to svn.
Without the patch the old branches magically inherit the new file just as
we could change the past.I have applied the patch.Thanks Rasmus, and Marcus for your analysis.SVN has its own set of problems.Especially with respect to importing your CVS history - these various tweaks
to CVS can burn the importer, it will be quite a chore to indentify those
subtly corrupt ,v files, tweak them, and ensure the resulting repository is
golden.

However SVN has one distinct advantage, and that's when you are reorganizing.
Renaming files -and directories- is painless, and history is preserved. Not
that I'm advocating either way.

Bill

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit:http://www.php.net/unsub.php

Offline

  • Root
  • » PHP
  • » [PHP-DEV] CVS Repository Corruption [RSS Feed]

Board footer

Moderator control

Enjoy the 22nd of January
PoweredBy

The Forums are managed by develissimo stuff members, if you find any issues or misplaced content please help us to fix it. Thank you! Tell us via Contact Options
Leave a Message
Welcome to Develissimo Live Support