[Subclipse-users] Merge questions

I have two questions about merging, one small and one large and the
answer to the second might also solve the first.

The first problem is that after a merge from a branch back to HEAD,
there are a few files that ALWAYS show up in Team->Synchronize with
Repository as needing to be committed even though there have not been
changes to these files in months. Checking them in does no good, the
next merge I do will bring them back as needing to be checked in again.

I suspect some svn property is causing this but I don't know what it
might be. Can you tell me?

The second question is this. On another branch, I have been working on
a wholesale change of the entire system. Basically this new system will
use Maven, and the previous one did not. Code has been moved between
projects, or into new directory structures and there are new projects
created, old projects deleted, etc. Eventually, I am going to want this
branch to BECOME the _trunk, replacing anything that is now in the
trunk. I will want the no-longer used projects to be gone from the
trunk, the new projects added to the trunk, and those projects that have
been changed to still exist. The project structure is basically

_trunk
   projectA
   projectB
   projectC

_branches
   BRANCH_NEW
     projectA
     projectC
     projectD
     projectE

and I will want it to be this

_trunk
   projectA
   projectC
   projectD
   projectE

Oh, yes, and I'd also like history to be maintained.

What type of merge is the best way to achieve this? Or is there a
better way? And if I do it will the first small problem be solved?

Thanks. I know this is a tall order.

Steve Cohen

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2446720

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-02-11 16:11:53 CET