Re: Further debugging of iterative imports
Alex Bennee <[email protected]> Wed, 15 Dec 2010 09:56:53 +0000
| Newsgroups | gmane.comp.version-control.subversion.cvs2svn.devel |
|---|---|
| Message-ID | <[email protected]> |
On 14 December 2010 20:33, Michael Haggerty <[email protected]> wrote: > On 12/14/2010 08:12 PM, Alex Bennee wrote: >> Further to my previous emails found another failure case that >> causes diverging history. It's probably clearest if I just show the >> import log: >> [...] > > Again, your two-column diffs have been munged by your mailer and are > almost impossible to read. Please provide the diffs as a text > attachment or in some other format. Apologies, I keep forgetting that even though I'm editing the mail in plain text in emacs Gmail does it's own special thing. I have attached the previous log snippet. >> The right hand side is the second import and as you can see from the >> log two files that were in their own commit have this time been >> wrapped up into another commit. >> >> Looking at the CVS log entry for that redundancy.c I can see the >> following: [...] >> >> The log for coswd/coswdtrap/coswdtrap.c is totally different: [...] > > That fact that the log messages are different is irrelevant, because > what cvs2svn is combining into one commit are not the r1.1 versions of > each file, but the act of adding the two files to branch > 'vectastar-3-3-20-red-e1-opt-branch'. CVS does not record any metadata > when a file is added to a branch, so cvs2svn tries to group them > together whenever there is not another constraint that prevents it from > doing so. It seems a little odd as the manufactured commit is using date/time straight out of the log. It seems the lumping together should be constrained by the commit times. >> Can anyone offer a pointer to where cvs2svn makes the decision on >> creating these manufactured commits and how it decides which ones >> match? > > See doc/design-notes.txt and doc/symbol-notes.txt in the source tree. > Either there is some source of indeterminacy in the heuristics that are > being used to select changesets (which might be fixable with minimal > work), or you are experiencing a case where later changes to the CVS > repository are causing the heuristics to make different choices during > the second conversion compared to the first one (only fixable with > massive work). It's certainly not the second case as these files haven't been touched in a while. I shall have a poke around and see if I can figure out where it's going wrong. -- Alex, homepage: http://www.bennee.com/~alex/ http://www.half-llama.co.uk ------------------------------------------------------ http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1667&dsMessageId=2690857 To unsubscribe from this discussion, e-mail: [[email protected]].
section.log
(text/x-log, 5.3 KB)
commit d37e1725b03079ba7cdc2b2f6b4cb94de4f69fc3 | commit 0eff38cc7583b83381a4b9b664df8d56ecac54d9
Author: srowe <> Author: srowe <>
Date: Wed Feb 8 12:15:32 2006 +0000 Date: Wed Feb 8 12:15:32 2006 +0000
New-fangled format with id, severity and category New-fangled format with id, severity and category
commit b3076758cbf9ff47b0e03b4382f6fa9a2ea86c87 | commit 0a57a092a623d30ab471e9db4e34bdc108adf99a
Author: cvs2svn <[email protected]> Author: cvs2svn <[email protected]>
Date: Wed Feb 8 11:29:12 2006 +0000 Date: Wed Feb 8 11:29:12 2006 +0000
This commit was manufactured by cvs2svn to create branch This commit was manufactured by cvs2svn to create branch
'vectastar-3-3-20-red-e1-opt-branch'. 'vectastar-3-3-20-red-e1-opt-branch'.
Cherrypick from master 2006-02-08 11:29:10 UTC jbpn ' - Cherrypick from master 2006-02-08 11:29:10 UTC jbpn ' -
coswd/coswdtrap/Makefile coswd/coswdtrap/Makefile
coswd/coswdtrap/coswdtrap.c coswd/coswdtrap/coswdtrap.c
> nms-manager-apps/vsodu/redundancy.c
> nms-manager-apps/vsodu/redundancy.h
commit 017fcf0ad04f75730ba29e1d2ded6705ba99917a | commit 1d5eaabe9341a03f11731c343d5f19c07acc2a06
Author: dpg <> Author: dpg <>
Date: Tue Feb 7 15:57:48 2006 +0000 Date: Tue Feb 7 15:57:48 2006 +0000
- more changes to support SAP - more changes to support SAP
commit 1e847f460640037f9758eba662168813e2f202be | commit 252117324e16ae362348fc585d5108b676eec722
Author: dpg <> Author: dpg <>
Date: Tue Feb 7 15:14:47 2006 +0000 Date: Tue Feb 7 15:14:47 2006 +0000
- move registry dumping to SIGUSR2 to avoid clash with - move registry dumping to SIGUSR2 to avoid clash with
commit ec9a2900fa61b1e5e165eead261b2d7d0d89d626 | commit 9f541aae6c8ab24f3d3934d853e8693eb920d99d
Author: dwp <> Author: dwp <>
Date: Tue Feb 7 14:18:51 2006 +0000 Date: Tue Feb 7 14:18:51 2006 +0000
Don't package mmasic.cgf file on ACODUAPs and SAPs - they Don't package mmasic.cgf file on ACODUAPs and SAPs - they
ASIC in modem-only mode! ASIC in modem-only mode!
commit 4fef61972d27b5963e2a6c3201c06a12aa44dedc | commit 1118f12a1b6563a563b0691b4b558a9cd3b0df77
Author: dwp <> Author: dwp <>
Date: Tue Feb 7 13:48:48 2006 +0000 Date: Tue Feb 7 13:48:48 2006 +0000
Fix to ACODU AP MAC problem whereby the MAC capture RAM b Fix to ACODU AP MAC problem whereby the MAC capture RAM b
commit 95c099aac5dcec652591e2ec867102b7d0a15015 | commit 1823713af5472c611f35fb0b159f8cc1be1c0932
Author: dpg <> Author: dpg <>
Date: Tue Feb 7 12:36:02 2006 +0000 Date: Tue Feb 7 12:36:02 2006 +0000
- observe /flashC/icu/e1_clk_master.conf if it exists - observe /flashC/icu/e1_clk_master.conf if it exists
commit 68968e2eaaa9dcb558be60c4b03babacc123d8e5 | commit 63722e7d1871944f3303e8e78cd3093c7c5214d9
Author: srowe <> Author: srowe <>
Date: Tue Feb 7 12:08:46 2006 +0000 Date: Tue Feb 7 12:08:46 2006 +0000
We're using db3 now We're using db3 now
commit 2d90005eb5219a15ef36b168078851e36c57c7df | commit 969764221704c2baa9050c01b24608ed66f1c551
Author: dpg <> Author: dpg <>
Date: Tue Feb 7 12:03:47 2006 +0000 Date: Tue Feb 7 12:03:47 2006 +0000
- fix SIGTERM exiting - fix SIGTERM exiting
commit 5e19b7d8e30c897fe6fb76802b90971ef865d14d | commit 1df6b877d599f8c3d8fe2cf25179221fde7d9828
Author: jbpn <> Author: jbpn <>
Date: Mon Feb 6 17:53:24 2006 +0000 Date: Mon Feb 6 17:53:24 2006 +0000
- in AP mode, display redundancy configuration and allo - in AP mode, display redundancy configuration and allo
configured configured
[from HEAD] [from HEAD]
commit 9db446751c4b64fd6683362940aeafe0db1db631 | commit dcea7f60a9410aab97298897bb842745de3197f7
Author: jbpn <> Author: jbpn <>
Date: Mon Feb 6 17:53:10 2006 +0000 Date: Mon Feb 6 17:53:10 2006 +0000
- add redundancy objects - add redundancy objects
[from HEAD] [from HEAD]
commit 4438ee12ae54652078cb2da614a17b4c490372c6 <
Author: cvs2svn <[email protected]> <
Date: Mon Feb 6 17:46:24 2006 +0000 <
<
This commit was manufactured by cvs2svn to create branch <
'vectastar-3-3-20-red-e1-opt-branch'. <
<
Cherrypick from master 2006-02-06 17:46:23 UTC jbpn ' - <
nms-manager-apps/vsodu/redundancy.c <
nms-manager-apps/vsodu/redundancy.h <
<
commit f067004514d939eb08181902de3ef4e2b1b22de0 commit f067004514d939eb08181902de3ef4e2b1b22de0
Author: ajz <> Author: ajz <>
Date: Mon Feb 6 17:42:42 2006 +0000 Date: Mon Feb 6 17:42:42 2006 +0000
Add support for ATM-ACODUs as syncd masters. Add support for ATM-ACODUs as syncd masters.
Also Stand Alone APs (but this is untested). Also Stand Alone APs (but this is untested).
Removed "e1conc" target/reference. Instead just use "e1" Removed "e1conc" target/reference. Instead just use "e1"
syncd will auto detect if it is a ATM-ACODU/Eth-ACODU/S syncd will auto detect if it is a ATM-ACODU/Eth-ACODU/S