svn add, patches and conflicts

[Thorsten Scherler <th...@apache.org>]

El mié, 05-10-2005 a las 10:14 +0200, Cyriaque Dupoirieux escribió:
...
> > Thorsten Scherler wrote:
> >...
> >> You will have to do a "svn add" on all new files and then you can do 
> >> cd forrest-trunk/whiteboard/plugins/
> >
> Be carreful with "svn add" because I had several problem when I did this 
> and send a patch :
> When the patch has been applied, I could not update anymore because of a 
> conflict with the added files and the existing on my own machine.
> I had to remove some directories containing added files ...

Yes, that is right, after the patch is applied but changes where made
while doing this, you will get conflicts. Moving the files away before
doing the update should solve this problem.

salu2
-- 
thorsten

"Together we stand, divided we fall!" 
Hey you (Pink Floyd)