You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Branko Čibej <br...@xbc.nu> on 2002/06/03 18:46:27 UTC

A bit of comic releif

[brane@SILMARIL repo]$ svn st
M      ./build/win32/build_neon.bat
[brane@SILMARIL repo]$ cp win-tests.py win-tests.py.orig
[brane@SILMARIL repo]$ svn st
M      ./build/win32/build_neon.bat
[brane@SILMARIL repo]$ ll win-tests.py*
-rw-r--r--    1 brane    None         3373 Jun  3 20:06 win-tests.py
-rw-r--r--    1 brane    None         3373 Jun  3 20:44 win-tests.py.orig
[brane@SILMARIL repo]$ svn st win-tests.py.orig
?      win-tests.py.orig



Looks like we managed to outsmart ourselves ... :-)

-- 
Brane Čibej   <br...@xbc.nu>   http://www.xbc.nu/brane/


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: A bit of comic releif

Posted by Branko Čibej <br...@xbc.nu>.
Ben Collins-Sussman wrote:

>Branko Čibej <br...@xbc.nu> writes:
>
>  
>
>>[brane@SILMARIL repo]$ svn st
>>M      ./build/win32/build_neon.bat
>>[brane@SILMARIL repo]$ cp win-tests.py win-tests.py.orig
>>[brane@SILMARIL repo]$ svn st
>>M      ./build/win32/build_neon.bat
>>[brane@SILMARIL repo]$ ll win-tests.py*
>>-rw-r--r--    1 brane    None         3373 Jun  3 20:06 win-tests.py
>>-rw-r--r--    1 brane    None         3373 Jun  3 20:44 win-tests.py.orig
>>[brane@SILMARIL repo]$ svn st win-tests.py.orig
>>?      win-tests.py.orig
>>
>>
>>
>>Looks like we managed to outsmart ourselves ... :-)
>>
>>    
>>
>
>Huh?  I don't get it.  All that's going on is that "*.orig" is in the
>svn:ignore property for /trunk.  That's why 'svn st' isn't showing it to you.
>  
>

Oh my, you are so right. I'd "just naturally assumed" this had something 
to do with original texts we provide for a conflicted file. Stupid me.

Anyway, there's *.rej in svn:ignore, too. I think it's time we got rid 
of those.

-- 
Brane Čibej   <br...@xbc.nu>   http://www.xbc.nu/brane/



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: A bit of comic releif

Posted by Ben Collins-Sussman <su...@collab.net>.
Branko Čibej <br...@xbc.nu> writes:

> [brane@SILMARIL repo]$ svn st
> M      ./build/win32/build_neon.bat
> [brane@SILMARIL repo]$ cp win-tests.py win-tests.py.orig
> [brane@SILMARIL repo]$ svn st
> M      ./build/win32/build_neon.bat
> [brane@SILMARIL repo]$ ll win-tests.py*
> -rw-r--r--    1 brane    None         3373 Jun  3 20:06 win-tests.py
> -rw-r--r--    1 brane    None         3373 Jun  3 20:44 win-tests.py.orig
> [brane@SILMARIL repo]$ svn st win-tests.py.orig
> ?      win-tests.py.orig
> 
> 
> 
> Looks like we managed to outsmart ourselves ... :-)
> 

Huh?  I don't get it.  All that's going on is that "*.orig" is in the
svn:ignore property for /trunk.  That's why 'svn st' isn't showing it to you.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org