You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Germán Arias <ge...@xelalug.org> on 2011/11/12 06:50:37 UTC
Status S
Hi. After replace a file inside directory "staticOfRigidBodies",
seems like I have a branch:
german@german-desktop:~/Instalados/FisicaLab$ svn status
? FisicaLab.app
? obj
M MIInformacion.m
S English.lproj/staticRigidBodies.gorm
M ChangeLog
M Spanish.lproj/staticRigidBodies.gorm/viga2FSE.tif
M Spanish.lproj/staticRigidBodies.gorm/vigasArm.tif
M Spanish.lproj/staticRigidBodies.gorm/vigaSE.tif
After revert all files in dir "staticOfRigidBodies", the branch is
still there.
How can I delete it? Thanks in advance.
Re: Status S
Posted by Konstantin Kolinko <kn...@gmail.com>.
2011/11/12 Germán Arias <ge...@xelalug.org>:
> On 2011-11-12 01:00:10 -0600 Konstantin Kolinko <kn...@gmail.com>
> wrote:
>
>>
>> Run "svn switch" on the file using its URL for trunk.
>>
>> That will switch it back to trunk.
>>
>> Best regards,
>> Konstantin Kolinko
>>
>
> Thanks, this solve the problem. But, is there a way to replace a file?. I
> work with interface
> in spanish then (to not duplicate the work) I would like replace the english
> interfaz. And then
> change the text strings from spanish to english. Is this possible?
How about using Unix's "cp" command (instead of "svn cp")?
Best regards,
Konstantin Kolinko
Re: Status S
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Konstantin Kolinko wrote on Sat, Nov 12, 2011 at 11:00:10 +0400:
> 2011/11/12 Germán Arias <ge...@xelalug.org>:
> > Hi. After replace a file inside directory "staticOfRigidBodies",
> > seems like I have a branch:
> >
> > german@german-desktop:~/Instalados/FisicaLab$ svn status
> > ? FisicaLab.app
> > ? obj
> > M MIInformacion.m
> > S English.lproj/staticRigidBodies.gorm
> > M ChangeLog
> > M Spanish.lproj/staticRigidBodies.gorm/viga2FSE.tif
> > M Spanish.lproj/staticRigidBodies.gorm/vigasArm.tif
> > M Spanish.lproj/staticRigidBodies.gorm/vigaSE.tif
> >
> > After revert all files in dir "staticOfRigidBodies", the branch is still
> > there.
> > How can I delete it? Thanks in advance.
>
> Run "svn switch" on the file using its URL for trunk.
>
> That will switch it back to trunk.
By the way, running switch on the wc root --- for example,
svn switch `svn info | grep ^URL | awk '{print $2}'`
--- has the effect of undoing _all_ subtree switches.
Re: Status S
Posted by Germán Arias <ge...@xelalug.org>.
On 2011-11-12 01:00:10 -0600 Konstantin Kolinko
<kn...@gmail.com> wrote:
>
> Run "svn switch" on the file using its URL for trunk.
>
> That will switch it back to trunk.
>
> Best regards,
> Konstantin Kolinko
>
Thanks, this solve the problem. But, is there a way to replace a
file?. I work with interface
in spanish then (to not duplicate the work) I would like replace the
english interfaz. And then
change the text strings from spanish to english. Is this possible?
Re: Status S
Posted by Konstantin Kolinko <kn...@gmail.com>.
2011/11/12 Germán Arias <ge...@xelalug.org>:
> Hi. After replace a file inside directory "staticOfRigidBodies",
> seems like I have a branch:
>
> german@german-desktop:~/Instalados/FisicaLab$ svn status
> ? FisicaLab.app
> ? obj
> M MIInformacion.m
> S English.lproj/staticRigidBodies.gorm
> M ChangeLog
> M Spanish.lproj/staticRigidBodies.gorm/viga2FSE.tif
> M Spanish.lproj/staticRigidBodies.gorm/vigasArm.tif
> M Spanish.lproj/staticRigidBodies.gorm/vigaSE.tif
>
> After revert all files in dir "staticOfRigidBodies", the branch is still
> there.
> How can I delete it? Thanks in advance.
Run "svn switch" on the file using its URL for trunk.
That will switch it back to trunk.
Best regards,
Konstantin Kolinko