An Internal Error Occurred During Svn Merge . Java.lang.nullpointerexception
with 1.4 snapshot This message: [ Message body ] [ More options ] Related messages: [ Next message ] [ Previous message ] [ In reply to ] From: Mark Phippard
this post in threaded view ♦ ♦ | Report Content as Inappropriate ♦ ♦ Branch merge issues Hi, I've been trying to use Subclipse to merge files and folders without success for a few hours now. I thought I'd write and discuss my difficulties - Subclipse 1.6.2, Java HL 1.6.2 (rv37639), svn repository 1.5. My basic goal is to merge changes from TRUNK to a branch. I am in the branch workspace, and do a team/merge. My first issue is the complexity of the dialog box. Subclipse makes no effort https://svn.haxx.se/subusers/archive-2008-05/0053.shtml to understand that the head of TRUNK and the head of the branch are the elements that are important. Instead, each time I go to the dialog I have to select the TRUNK URI at the top, then select the head revision, then unselect the From checkbox, then select the branch URI, and then select the head of the branch. This is a very http://tigris-scm.10930.n7.nabble.com/Branch-merge-issues-td70921.html slow UI, and doesn't map to the meaningful operations in a business scenario. My second issue is that the merge is immediate. With CVS, performing a merge will provide a dialog that allows the user to pick and choose which files to merge back. I can find no equivalent to this in Subclipse. My third issue is that the merge completes with lots of .prej files, one for every file that has two different revisions (one revision on TRUNK and one on the branch). This is because the repository was just converted from CVS, and the cvs-rev svn property is different between TRUNK and the Branch. I can find no way to ignore this property during the merge process, and it effectively makes merging useless. My fourth issue is that I have NPE from the completed merge when I attempt to synchronize and then double click to compare the changes. This originally occurred on every attempt to view the file in the compare view, now it doesn't. I don't know what has changed. ENTRY org.eclipse.jface 4 2 2009-05-22 16:41:32.075 !MESSAGE Problems occurred when invoking code from plug-in: "org.ecli
Reply | Threaded Open this an internal post in threaded view ♦ ♦ | Report Content as Inappropriate ♦ ♦ NullPointerException during merge with 1.4 snapshot an internal error Hi, I tried a merge and got the following exception: An internal error occurred during: "SVN Merge". java.lang.NullPointerException at org.tmatesoft.svn.core.internal.wc.DefaultSVNMerger.getMergeAction(DefaultSVNMerger.java:272) at org.tmatesoft.svn.core.internal.wc.DefaultSVNMerger.processMergedFiles(DefaultSVNMerger.java:246) at org.tmatesoft.svn.core.internal.wc.AbstractSVNMerger.mergeText(AbstractSVNMerger.java:72) at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea.mergeText(SVNAdminArea.java:467) at org.tmatesoft.svn.core.internal.wc.SVNMergeCallback.fileChanged(SVNMergeCallback.java:258) at org.tmatesoft.svn.core.internal.wc.SVNRemoteDiffEditor.closeFile(SVNRemoteDiffEditor.java:296) at org.tmatesoft.svn.core.internal.wc.SVNCancellableEditor.closeFile(SVNCancellableEditor.java:140) at org.tmatesoft.svn.core.internal.io.svn.SVNEditModeReader.processCommand(SVNEditModeReader.java:158) at org.tmatesoft.svn.core.internal.io.svn.SVNEditModeReader.driveEditor(SVNEditModeReader.java:213) at org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryImpl.diff(SVNRepositoryImpl.java:1392) at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.driveMergeReportEditor(SVNMergeDriver.java:1724) at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.doDirectoryMerge(SVNMergeDriver.java:703) at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.doMerge(SVNMergeDriver.java:472) at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.runPeggedMerge(SVNMergeDriver.java:218) at org.tmatesoft.svn.core.wc.SVNDiffClient.doMerge(SVNDiffClient.java:1333) at org.tmatesoft.svn.core.javahl.SVNClientImpl.merge(SVNClientImpl.java:923) at org.tmatesoft.svn.core.javahl.SVNClientImpl.merge(SVNClientImpl.java:908) at org.tigris.subversion.svnclientadapter.javahl.AbstractJhlClientAdapter.merge(AbstractJhlClientAdapter.java:1962) at org.tigris.subversion.svnclientadapter.javahl.AbstractJhlClientAdapter.merge(AbstractJhlClientAdapter.java:1993) at org.tigris.subversion.svnclientadapt