Swarm - andreas

All Activity Followed Activity Reviews Commits Comments Jobs
	6 years agoandreas_haferburg commented on job000599 for See https://swarm.workshop.perforce.com/projects/perforce-software-p4convert/jobs/job000743#comments for a workaround
	1 comment

	6 years agoandreas_haferburg edited a comment on job000624 for I debugged this a bit, but I still don't understand it. I enabled logging with `log4j.logger.com.perforce.common.process.ProcessNode=INFO log4j.logger.` ... I debugged this a bit, but I still don't understand it. I enabled logging with `log4j.logger.com.perforce.common.process.ProcessNode=INFO log4j.logger.com.perforce.common.asset.TranslateContent=DEBUG log4j.logger.com.perforce.svn.change.RevisionImport=TRACE log4j.logger.com.perforce.common.client.P4Factory=TRACE` And all the paths printed are correct. 11 Mär 2019 12:28:36,893 DEBUG com.perforce.svn.process.SvnProcessNode ... empty file using type: P4_TEXT 11 Mär 2019 12:28:36,899 INFO com.perforce.common.process.ProcessNode ... 2.0 A:F - trunk/entwürfe.txt (UTF-8) 11 Mär 2019 12:28:36,908 DEBUG com.perforce.svn.change.RevisionImport ... addFile(//Scopis/trunk/entwürfe.txt) 11 Mär 2019 12:28:36,917 TRACE com.perforce.svn.change.RevisionImport ... writeClientFile(D:\p4c\unicode\run1\ws/trunk/entwürfe.txt) 11 Mär 2019 12:28:36,930 TRACE com.perforce.common.client.P4Factory ... D:\p4c\unicode\run1\ws/trunk\entwürfe.txt - empty, assuming text. 11 Mär 2019 12:28:36,930 TRACE com.perforce.svn.change.RevisionImport ... reopenProps(text+) 11 Mär 2019 12:28:36,954 DEBUG com.perforce.svn.change.ChangeImport ... submitting changelist <a href="/@2" target="_self">2</a> by user AHaferbu 11 Mär 2019 12:28:36,992 TRACE com.perforce.common.client.P4Factory ... Submitted as change <a href="/@2" target="_self">2</a> 11 Mär 2019 12:28:37,012 INFO com.perforce.common.process.ProcessChange ... mapping: r2 => <a href="/@2" target="_self">@2</a> I even used a file change watcher to monitor the working copy, and when p4convert creates files locally from the SVN dump, the file paths are still correct. These files are then added by p4java, and committed. So I suspect the bug is in p4java or p4d. «
	2 comments

	6 years agoandreas_haferburg edited a comment on job000624 for I debugged this a bit, but I still don't understand it. I enabled logging with `log4j.logger.com.perforce.common.process.ProcessNode=INFO` log4j.logger ... I debugged this a bit, but I still don't understand it. I enabled logging with `log4j.logger.com.perforce.common.process.ProcessNode=INFO` log4j.logger.com.perforce.common.asset.TranslateContent=DEBUG log4j.logger.com.perforce.svn.change.RevisionImport=TRACE log4j.logger.com.perforce.common.client.P4Factory=TRACE And all the paths printed are correct. 11 Mär 2019 12:28:36,893 DEBUG com.perforce.svn.process.SvnProcessNode ... empty file using type: P4_TEXT 11 Mär 2019 12:28:36,899 INFO com.perforce.common.process.ProcessNode ... 2.0 A:F - trunk/entwürfe.txt (UTF-8) 11 Mär 2019 12:28:36,908 DEBUG com.perforce.svn.change.RevisionImport ... addFile(//Scopis/trunk/entwürfe.txt) 11 Mär 2019 12:28:36,917 TRACE com.perforce.svn.change.RevisionImport ... writeClientFile(D:\p4c\unicode\run1\ws/trunk/entwürfe.txt) 11 Mär 2019 12:28:36,930 TRACE com.perforce.common.client.P4Factory ... D:\p4c\unicode\run1\ws/trunk\entwürfe.txt - empty, assuming text. 11 Mär 2019 12:28:36,930 TRACE com.perforce.svn.change.RevisionImport ... reopenProps(text+) 11 Mär 2019 12:28:36,954 DEBUG com.perforce.svn.change.ChangeImport ... submitting changelist <a href="/@2" target="_self">2</a> by user AHaferbu 11 Mär 2019 12:28:36,992 TRACE com.perforce.common.client.P4Factory ... Submitted as change <a href="/@2" target="_self">2</a> 11 Mär 2019 12:28:37,012 INFO com.perforce.common.process.ProcessChange ... mapping: r2 => <a href="/@2" target="_self">@2</a> I even used a file change watcher to monitor the working copy, and when p4convert creates files locally from the SVN dump, the file paths are still correct. These files are then added by p4java, and committed. So I suspect the bug is in p4java or p4d. «
	2 comments

	6 years agoandreas_haferburg commented on job000624 for I debugged this a bit, but I still don't understand it. I enabled logging with `log4j.logger.com.perforce.common.process.ProcessNode=INFO log4j.logger.` ... I debugged this a bit, but I still don't understand it. I enabled logging with `log4j.logger.com.perforce.common.process.ProcessNode=INFO log4j.logger.com.perforce.common.asset.TranslateContent=DEBUG log4j.logger.com.perforce.svn.change.RevisionImport=TRACE log4j.logger.com.perforce.common.client.P4Factory=TRACE` And all the paths printed are correct. 11 Mär 2019 12:28:36,893 DEBUG com.perforce.svn.process.SvnProcessNode ... empty file using type: P4_TEXT 11 Mär 2019 12:28:36,899 INFO com.perforce.common.process.ProcessNode ... 2.0 A:F - trunk/entwürfe.txt (UTF-8) 11 Mär 2019 12:28:36,908 DEBUG com.perforce.svn.change.RevisionImport ... addFile(//Scopis/trunk/entwürfe.txt) 11 Mär 2019 12:28:36,917 TRACE com.perforce.svn.change.RevisionImport ... writeClientFile(D:\p4c\unicode\run1\ws/trunk/entwürfe.txt) 11 Mär 2019 12:28:36,930 TRACE com.perforce.common.client.P4Factory ... D:\p4c\unicode\run1\ws/trunk\entwürfe.txt - empty, assuming text. 11 Mär 2019 12:28:36,930 TRACE com.perforce.svn.change.RevisionImport ... reopenProps(text+) 11 Mär 2019 12:28:36,954 DEBUG com.perforce.svn.change.ChangeImport ... submitting changelist <a href="/@2" target="_self">2</a> by user AHaferbu 11 Mär 2019 12:28:36,992 TRACE com.perforce.common.client.P4Factory ... Submitted as change <a href="/@2" target="_self">2</a> 11 Mär 2019 12:28:37,012 INFO com.perforce.common.process.ProcessChange ... mapping: r2 => <a href="/@2" target="_self">@2</a> I even used a file change watcher to monitor the working copy, and when p4convert creates files locally from the SVN dump, the file paths are still correct. These files are then added by p4java, and committed. So I suspect the bug is in p4java or p4d. «
	2 comments

	6 years agoandreas_haferburg liked a comment on job000743 for It's true that the case changed (didn't even notice), but I don't think that's what's causing the issue. In SvnProcessChange.processChange(), p4conver ... It's true that the case changed (didn't even notice), but I don't think that's what's causing the issue. In SvnProcessChange.processChange(), p4convert processes files in the order they are listed in the dump. Unfortunately, SVN lists the add (copy) record before the delete. I found a small Python library for reading and writing SVN dumps at https://github.com/zeha/py-svndump I used it to write the attached script. It reads a dump, reorders the records for each revision such that the deletes come before any other node. This fixes the problems in 10661 and 10691. Currently waiting for confirmation on 22199. I don't understand why this happened on Linux, though. «
	6 comments

	6 years agoandreas_haferburg commented on job000743 for Well. The change in case might be the reason why the records are in that particular order, though.
	6 comments

	6 years agoandreas_haferburg commented on job000743 for It's true that the case changed (didn't even notice), but I don't think that's what's causing the issue. In SvnProcessChange.processChange(), p4conver ... It's true that the case changed (didn't even notice), but I don't think that's what's causing the issue. In SvnProcessChange.processChange(), p4convert processes files in the order they are listed in the dump. Unfortunately, SVN lists the add (copy) record before the delete. I found a small Python library for reading and writing SVN dumps at https://github.com/zeha/py-svndump I used it to write the attached script. It reads a dump, reorders the records for each revision such that the deletes come before any other node. This fixes the problems in 10661 and 10691. Currently waiting for confirmation on 22199. I don't understand why this happened on Linux, though. «
	6 comments

	6 years agoandreas_haferburg commented on job000743 for Oh, I see. Thank you for pointing that out. So the problem was actually in the conversion of 10661. In this commit, /trunk/NeuroNavigation/Application ... Oh, I see. Thank you for pointing that out. So the problem was actually in the conversion of 10661. In this commit, /trunk/NeuroNavigation/Application/IO/AbstractScreencast.cpp is deleted, and is then added back as a copy of trunk/NeuroNavigation/Application/IO/AbstractScreenCast.cpp@10657. The problem is that p4convert applies these changes in the wrong order: 28 Feb 2019 18:17:03,989 INFO com.perforce.common.process.ProcessNode ... 10661.3 B:F - trunk/NeuroNavigation/Application/IO/AbstractScreencast.cpp (UTF-8) 28 Feb 2019 18:17:04,820 INFO com.perforce.common.process.ProcessNode ... 10661.22 R:F - trunk/NeuroNavigation/Application/IO/AbstractScreenCast.cpp (UTF-8) Because it applies the branch/copy first, and the delete later, the result is that the file ends up missing on the Perforce server. On the plus side, the audit.log does have checksums for the missing files. «
	6 comments

	6 years agoandreas_haferburg commented on job000743 for Commit 10691 contains the following changes, according to Tortoise SVN: Deleted: /branches/_experimental/2012 NOVIS Refactoring/NeuroNavigation/Applic ... Commit 10691 contains the following changes, according to Tortoise SVN: Deleted: /branches/_experimental/2012 NOVIS Refactoring/NeuroNavigation/Application/IO/AbstractScreencast.cpp Added: /branches/_experimental/2012 NOVIS Refactoring/NOVIS/Screencast/AbstractScreencast.cpp as a copy of /trunk/NeuroNavigation/Application/IO/AbstractScreencast.cpp@10670 The file names may be the same, but the three paths are mutually different. I'm not sure what you mean by "referencing a deleted revision". At revision 10691, the history of /trunk/NeuroNavigation/Application/IO/AbstractScreencast.cpp says that this file was last changed at revision 10661. At 10670 it is not deleted. The SVN dump for 10691.2 contains the same info: Node-path: branches/_experimental/2012 NOVIS Refactoring/NOVIS/Screencast/AbstractScreencast.cpp Node-kind: file Node-action: add Node-copyfrom-rev: 10670 Node-copyfrom-path: trunk/NeuroNavigation/Application/IO/AbstractScreencast.cpp «
	6 comments

Show comments in files
View diffs side-by-side
Show space and newline characters
Ignore whitespace when calculating differences

I am the author, and
I change the state of a review
a review is requested
files in the review are updated
tests on the review have finished
a vote is cast on a review
the state of the review changes
a review or change is committed
a comment is made on the review or change
a comment on the review or change is updated
Someone likes one of my comments
I am a member, and
a review is requested
a review or change is committed
I am a reviewer, and
files in the review are updated
tests on the review have finished
a vote is cast on a review
the state of the review changes
someone joins or leaves the review
a review or change is committed
a comment is made on the review
a comment on the review is updated
I am a moderator, and
files in the review are updated
tests on the review have finished
a review or change is committed

andreas_haferburg

Profile Settings

Reviews

Time Display

Email me when: