Branch and merge / copy file beetween branch

Hello all,

I have a question about branch and merge.

I have a project P1, so I derive it into a branch project P2.

A/ In project P1, I had a new file foo.java because it's nice to have this
new functionality.

Is it possible to push the file foo.java into project P2 ?

I try it but SVN said that's not the same file (created / created) and I
need to create (hard coded) it on the second project without using merge (or
copy ) function.

B/ In project P2, I found a big bug in bar.java, so I fix it in P2.

Is it possible to send the fix on P1 ?

I try it, bug SVN said that's not he same file (modified / modified)

So the question is if we can manipulate the TREE to merge some file on the
ROOT version instead of creating a BRANCH for each file :-) of each project.

Thanks for all,

Best regards

David KELLER

 
Received on Thu Jan 18 21:43:00 2007