Re: cvs2git wrongly deletes files when creating branches
Markus Schöpflin <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.cvs2svn.user |
|---|---|
| Message-ID | <[email protected]> |
Am 17.06.2010 00:42, schrieb Max Bowsher: > I have just committed a change to trunk which I hope should fix this issue. Hmm, now things seem really odd. I tested it with the reproducer I provided earlier, and the results are quite surprising. For your reference, I have attached the output of 'git log --name-status --all' to this message. One shows the result from converting it with 2.3.0, the other with current SVN. - As you can see, the symbol00000 branch is now created between log1 and log2, but it should have been created between log5 and log8. - Also file002 is missing from symbol00001. - Next, a number of manufactured commits for branch creation are no longer present with the SVN version. If there is anything I can do to ease the investigation, please don't hesitate to ask. Markus ------------------------------------------------------ http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=2623059 To unsubscribe from this discussion, e-mail: [[email protected]].
git-log-all-2.3.0.log
(text/plain, 3.3 KB)
commit 4a5556cb0166325a0625f36eeab5b546daebeeab
Author: author5 <author5>
Date: Tue May 25 13:24:35 2010 +0000
log 15
M file001
commit 0657bbc1205e8563995e33bace0d97a0c27e87d8
Author: author5 <author5>
Date: Thu May 20 14:12:37 2010 +0000
log 7
M file001
commit c912030e5ae2f3946654e688f3a2e030df464215
Author: author5 <author5>
Date: Mon Mar 1 14:10:53 2010 +0000
log 6
M file001
commit 5ac96dc87ab2c8cb54a1d6672085adf878756e34
Author: author5 <author5>
Date: Mon Mar 1 09:35:14 2010 +0000
log 14
M file001
commit 3b2ff0ce49da36fe016a1e932f40415c368475e5
Author: author5 <author5>
Date: Fri Feb 19 09:15:14 2010 +0000
log 13
M file001
commit 7f4d099e497587996a88708928da30229824a74d
Author: author3 <author3>
Date: Tue Nov 7 08:53:27 2006 +0000
log 2
M file002
commit aa237cdc7ee42430ded88182f9ea2b399b94cc6a
Merge: 3f9292c 9463ebc
Author: cvs2svn <[email protected]>
Date: Fri Dec 16 12:47:31 2005 +0000
This commit was manufactured by cvs2svn to create branch 'symbol00000'.
commit 9463ebc99c41246f53d975051b334735ca3ceb01
Author: author1 <author1>
Date: Fri Dec 16 12:47:30 2005 +0000
log 1
A file002
commit c4cc0cae09782cbec4cfe60ae2af0d4737424d3d
Author: author2 <author2>
Date: Fri Dec 9 15:39:46 2005 +0000
file file002 was initially added on branch symbol00004.
commit 3f9292c9b2af858a06092014a8f420641ea996c8
Author: author6 <author6>
Date: Mon May 23 13:00:59 2005 +0000
log 12
M file001
commit 7e44c05f8c2d6268b8b02110cb7f7e454ec172b3
Author: author4 <author4>
Date: Wed Mar 2 09:11:20 2005 +0000
log 11
M file001
commit 39a511dace1b9c0d8c64fbdd4acc24fd3f3b884b
Author: author2 <author2>
Date: Fri Dec 10 16:06:33 2004 +0000
log 10
M file001
commit 19dc861a194e70ce3e551d280de025d756273858
Author: author6 <author6>
Date: Thu Jul 29 10:32:42 2004 +0000
log 9
M file001
commit 9e677064a6e455a784be513189de8d5583d3f2df
Author: author1 <author1>
Date: Mon Jul 19 15:09:29 2004 +0000
log 8
M file001
commit d24a151c3e39c42872ec20bdc3b1867e2f2a76da
Author: cvs2svn <[email protected]>
Date: Thu Mar 11 14:23:43 2004 +0000
This commit was manufactured by cvs2svn to create branch 'symbol00000'.
commit 5f2b936eebac8b515d52e5e388992b4047c4ce7b
Author: author1 <author1>
Date: Thu Mar 11 14:23:42 2004 +0000
log 5
M file001
commit 5118cdaf84cef6aad8c7051e22ca2ae7fd2c4681
Author: author4 <author4>
Date: Tue Mar 2 09:05:46 2004 +0000
log 16
M file001
commit d5db9081d6c08353cd8e2c28af3a3992fb551206
Author: cvs2svn <[email protected]>
Date: Tue Jul 29 14:48:57 2003 +0000
This commit was manufactured by cvs2svn to create branch 'symbol00001'.
commit 98121474a51a760ea9eb0980e88765a31f2a7bad
Author: author4 <author4>
Date: Tue Jul 29 14:48:56 2003 +0000
log 4
M file001
commit a7361d4dd1348d210df69fd348a56e7cff7bd874
Author: cvs2svn <[email protected]>
Date: Fri Aug 16 13:49:26 2002 +0000
This commit was manufactured by cvs2svn to create branch 'symbol00002'.
commit 075bf8a204213c53053edc3771ea9a7df7c4c8e1
Author: author1 <author1>
Date: Fri Aug 16 13:49:25 2002 +0000
log 3
A file001
commit 748223f650f4166ceeba54725de07c2075694085
Author: author1 <author1>
Date: Fri Aug 16 13:49:25 2002 +0000
This commit was generated by cvs2svn to track changes on a CVS vendor
branch.
git-log-all-svn.log
(text/plain, 2.5 KB)
commit 5899ca4618f90d813a7d3437964b0f76bde1879c
Author: author5 <>
Date: Tue May 25 13:24:35 2010 +0000
log 15
M file001
commit a2eb7966e9081191d774827d5fd9fd2c38130cb5
Author: author5 <>
Date: Thu May 20 14:12:37 2010 +0000
log 7
M file001
commit 7d3fb7a7cd2921b9b4239c7c363a21fcdd7c7772
Author: author5 <>
Date: Mon Mar 1 14:10:53 2010 +0000
log 6
M file001
commit a9024bd105f6de50d65f0e8523765b8ea85e687c
Author: author5 <>
Date: Mon Mar 1 09:35:14 2010 +0000
log 14
M file001
commit a8f1d2febc5e4200f5b2d17122382389b64f5aff
Author: author5 <>
Date: Fri Feb 19 09:15:14 2010 +0000
log 13
M file001
commit 6460b41028cfe2addb24922de10756ed6fd35d5a
Author: author3 <>
Date: Tue Nov 7 08:53:27 2006 +0000
log 2
M file002
commit 927365c49d0c9d9883da8845d0aa109e9b0569d2
Author: cvs2svn <[email protected]>
Date: Fri Dec 16 12:47:31 2005 +0000
This commit was manufactured by cvs2svn to create branch 'symbol00000'.
Cherrypick from master 2005-12-16 12:47:30 UTC author1 'log 1':
file002
A file002
commit d8fa21476023915492e4a2caf703dad544c77639
Author: author1 <>
Date: Fri Dec 16 12:47:30 2005 +0000
log 1
A file002
commit 073a6006865e9c9cf3761af1179a6c7a3759da26
Author: author6 <>
Date: Mon May 23 13:00:59 2005 +0000
log 12
M file001
commit 9313151f1d647d3029ecb77dfd42afa41a033d6e
Author: author4 <>
Date: Wed Mar 2 09:11:20 2005 +0000
log 11
M file001
commit 7f20d4905950b678160177554ce3768f4ba9c544
Author: author2 <>
Date: Fri Dec 10 16:06:33 2004 +0000
log 10
M file001
commit fc5ffc61e4f98dee91d3152e69740ace043800f8
Author: author6 <>
Date: Thu Jul 29 10:32:42 2004 +0000
log 9
M file001
commit fe07bd9022989f9ab7cf11d7a9040f2951a37c2e
Author: author1 <>
Date: Mon Jul 19 15:09:29 2004 +0000
log 8
M file001
commit 246ba88ce0c8134cda2539dd2cf7f1f2214489b3
Author: author1 <>
Date: Thu Mar 11 14:23:42 2004 +0000
log 5
M file001
commit cea62583d9a9cff067e7eca38b0bd7ae29ef2b7f
Author: author4 <>
Date: Tue Mar 2 09:05:46 2004 +0000
log 16
M file001
commit a3db25e028aa9e91dfb199968aace705b07d370e
Author: author4 <>
Date: Tue Jul 29 14:48:56 2003 +0000
log 4
M file001
commit 5feeea3733f8b0b75d3a1fa3de140fe48029f9f4
Author: author1 <>
Date: Fri Aug 16 13:49:25 2002 +0000
log 3
A file001
commit a10d16fd33bfc779aba71b8979a2d4f5f2a02c04
Author: author1 <>
Date: Fri Aug 16 13:49:25 2002 +0000
This commit was generated by cvs2svn to track changes on a CVS vendor
branch.