Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Subversive » Always get tree conflict on merge
Always get tree conflict on merge [message #557320] Mon, 06 September 2010 16:34 Go to next message
Tom Chiverton is currently offline Tom ChivertonFriend
Messages: 26
Registered: August 2010
Junior Member
Can anyone think why I would always get tree conflicts when merging a branch on to the trunk in a particular project ?
If I run 'svn diff' on the trunk and branch from the console (svn diff https://.../trunk https://.../branches/mybranch), it lists changes to files, but doesn't appear to explode the same way Subversive does. The changes it lists are all fairly minor.
The local copy of the trunk I'm trying to merge my branch to has no outstanding changes.

Eclipse 3.5 on Win32 with the latest Subversive for it.
Tried both the native Java and binary win32 connectors, to no noticeable difference, ditto using the reintergrate tab (or not).

[Updated on: Mon, 06 September 2010 16:40]

Report message to a moderator

icon4.gif  Re: Always get tree conflict on merge [message #557398 is a reply to message #557320] Tue, 07 September 2010 09:48 Go to previous message
Tom Chiverton is currently offline Tom ChivertonFriend
Messages: 26
Registered: August 2010
Junior Member
ohhhhhhh !
http://durak.org/sean/pubs/software/version-control-with-sub version-1.6/svn.branchmerge.basicmerging.html :
"In Subversion 1.5 [or later], once a --reintegrate merge is done from branch to trunk, the branch is no longer usable for further work. It's not able to correctly absorb new trunk changes, nor can it be properly reintegrated to trunk again"
Previous Topic:Problem with Flex Builder 3.2
Next Topic:Confusing merge behavior
Goto Forum:
  


Current Time: Fri Dec 19 12:29:26 GMT 2014

Powered by FUDForum. Page generated in 0.01646 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software