ok, sorry but I have very low knowledge about svn.
I had downloaded the two mentioned files, modified them locally then when I
tried to "commit" them TortoiseSVN always gave me an error back ("file
already exists" ??) which avoided the update on the branch. That is the
reason why I deleted them first.
Next time before doing something new to me I will ask if this is ok.
Just to give you an example of how bad is my knowledge of SVN...I do not
even understand then meaning of :
"all you need to do is merge it from trunk (or whatever)"
Maybe few words (really few) on the meaning of TAG, BRANCHES and TRUNK could
help me a bit.
DD
2010/4/10 buginator <[email protected]>
> On 4/9/10, [email protected] <[email protected]>
> wrote:
> > Revision: 10523
> >
> http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10523&view=rev
> > Author: dydo-ai
> > Date: 2010-04-09 20:04:37 +0000 (Fri, 09 Apr 2010)
> >
> > Log Message:
> > -----------
> > to be replaced with new ones to reflect DyDo 2.1 changes
> >
> > Removed Paths:
> > -------------
> > branches/2.3/data/mods/multiplay/Makefile.am
> > branches/2.3/data/mods/multiplay/makefile.win32
>
> Just a note, there is no need to delete the files first, all you need
> to do is merge it from trunk (or whatever). You should never delete
> files, and then create them again.
>
> _______________________________________________
> Warzone-dev mailing list
> [email protected]
> https://mail.gna.org/listinfo/warzone-dev
>
_______________________________________________
Warzone-dev mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-dev
