I got back the correctly filtered list of revisions after the revision I indicated was merged. > > I've tried it with the svn:mergeinfo only on /branch1, and on /branch1/eclipseprojecta and This is because the repository was just converted from CVS, and the cvs-rev svn property is different between TRUNK and the Branch. Hmm. 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 Source
Perhaps you could create a build with extra logging? >> >> Also I don't see why you wouldn't issue the svn mergeinfo at the level of each of the projects, and Edit: The error also occurs, if the psf-file contains only one project. Any suggestions to allow me to perform this simple task (merge selected files from TRUNK to branch) are welcome, although I'm not holding out much hope of ever being able to In both scenarios, a multiproject merge brings back every revision > and takes a loong time.
There is nothing noticeable > before this log message. > > Thank you again for any hints. Work fine, until I did a update some time ago. All Rights Reserved. Not the answer you're looking for?
The lack of such basic business led operations as this leads me to question how the authors are managing to use the tool. Cheers /Eike ---- http://www.esc-net.de http://thegordian.blogspot.com http://twitter.com/eikestepper Am 09.02.2015 um 15:38 schrieb Joachim Engelhardt: > Some further information, which I found in the workspace log file: > > > !ENTRY org.eclipse.core.jobs 4 While this might have once been the case, I don't believe it is a valid representation of how most users use svn. I do have a real issue with this now.
Get over it or go back to CVS. However, I've mostly > worked with branches that I created post merge tracking. I believe that the UI for Eclipse is the most logical place for that to start. There is no such thing as "trunk" in Subversion.
Subversion is not CVS. First book of a series: boy disappears from his life, becomes time travelling agent Yes, of course I'm an adult! What would be useful info for you to find out what the issue is here? On Wednesday 08 February 2006 18:55, Mark Phippard wrote: Martin Stechert
Mark _____________________________________________________________ __________ ____ __ Scanned for SoftLanding Systems, Inc. My recollection was that the UI comes entirely from the Eclipse compare plugin and we just provide the data model. There might be a folder with that name, but there is no guarantee. Selective merging from trunk to branch should be a basic graphical scm operation.
This is a very slow UI, and doesn't map to the meaningful operations in a business scenario. this contact form Yes No Thanks for your feedback! The CollabNet merge client offers some post-merge UI to help work with the results. > My third issue is that the merge completes with lots of .prej files, one for every Doing the same in the SVN Repository explorer gives the SVN command in the SVN console (no other output), too.
I didn't know. I might even suggest you write some kind of script to remove them from a dump of your repository and then reload it. > My fourth issue is that I have Creating the door of a castle Find area of the triangle ABC Is 8:00 AM an unreasonable time to meet with my graduate students and post-doc? have a peek here Weird svn users (who use a different scheme without trunk/branch concepts) wouldn't and would just continue to type long URLs. ------------------------------------------------------ http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2353135To unsubscribe from this discussion, e-mail: [[hidden email]].
Seems like there was some bad data that stayed in there when I updated from 1.6 to 1.10 ------------------------------------------------------ http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1046&dsMessageId=3069310To unsubscribe from this discussion, e-mail: [[hidden email]]. About 30 eclipse projects. Most users would set these.
Why are some programming languages Turing complete but lack some abilities of other languages? The details say, that there is a java.lang.NullPointerException. Error The message you referenced does not exist. With this in mind, we've made the decision to discontinue our Bamboo Cloud offering on 31 January 2017.
What > happens then if another one does it on the project level? > Then he doesnt see those properties i guess? Regards, Martin. ENTRY org.eclipse.jface 4 2 2009-05-22 16:41:32.075 !MESSAGE Problems occurred when invoking code from plug-in: "org.eclipse.jface". !STACK 0 java.lang.NullPointerException at org.tigris.subversion.subclipse.core.resources.RemoteResource.equals(RemoteResource.java:154) at org.tigris.subversion.subclipse.core.resources.RemoteFile.equals(RemoteFile.java:155) http://dukesoftwaresolutions.com/an-internal/an-internal-application-error-occurred-java-lang-nullpointerexception.html I've never > had a problem doing this, even before merge tracking.
The "classic" setup exists to make the URL's easy to manage and tools like TortoiseSVN and Subclipse that remember your URL's make it even easier. Thank you again for any hints. And the merge tool should default to appropriate values (like comparing the current branch to trunk and selecting the head revision checkbox. > > Finally, I'd suggest providing a general URL asked 3 years ago viewed 385 times active 3 years ago Related 594What are the pros and cons of the SVN plugins for Eclipse, Subclipse and Subversive?158Subclipse svn:ignore9Subclipse plugin doesn't work