Is this possible in Subversion?

[Martin Marconcini <ma...@marconcini.com.ar>]

Hi Everybody,

Today one of our developers (who comes from VSS) asked me a question  
about svn and I have been unable to provide him with a decent answer;  
I've been walking through google results and mailing list archives  
but couldn't come up with a solution.

I'll just say what he wants to do in case somebody has que same  
question in mind:

Is there such thing as "svn update --replace_existing_non_versioned" ?

It is a file that already exists with the same name locally (is  
unversioned) and you're bringing a new version from the repository.  
It should ask "Replace Local" Yes/No.
The thing is: if the file is versioned and is locally, svn will merge  
(or try at least), but if the file is not there, there's a file exist  
conflict. He wants a way to --force the update to replace the local  
file.

He showed me a VSS option called "REPLACE LOCAL" that does exactly  
this. I couldn't come up with a simple solution (except from manually  
deleteing the "should be replaced locally stored files" by hand.

Any insight?

--
Martín Marconcini
“The bitterness of poor quality lasts much longer than the sweetness  
of meeting the schedule.” Anonymous



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

Re: Is this possible in Subversion?

["Paul T. Burba" <pt...@adelphia.net>]

Mark Phippard wrote:
> Martin Marconcini wrote:
>> Hi Everybody,
>>
>> Today one of our developers (who comes from VSS) asked me a question 
>> about svn and I have been unable to provide him with a decent answer; 
>> I've been walking through google results and mailing list archives but 
>> couldn't come up with a solution.
>>
>> I'll just say what he wants to do in case somebody has que same 
>> question in mind:
>>
>> Is there such thing as "svn update --replace_existing_non_versioned" ?
>>
>> It is a file that already exists with the same name locally (is 
>> unversioned) and you're bringing a new version from the repository. It 
>> should ask "Replace Local" Yes/No.
>> The thing is: if the file is versioned and is locally, svn will merge 
>> (or try at least), but if the file is not there, there's a file exist 
>> conflict. He wants a way to --force the update to replace the local file.
>>
>> He showed me a VSS option called "REPLACE LOCAL" that does exactly 
>> this. I couldn't come up with a simple solution (except from manually 
>> deleteing the "should be replaced locally stored files" by hand.
>>
>> Any insight?
> This change has been implemented in trunk and thus will be part of 1.5.  
> It either happens automatically, or you have to supply the --force 
> parm.  I cannot remember which was finally decided.

Currently in trunk you need to use --force.  It's always possible that 
could change by the time 1.5 is released, but for now it's not the 
default behavior.

Paul B.

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

Re: Is this possible in Subversion?

[Mark Phippard <ma...@gmail.com>]

Martin Marconcini wrote:
> Hi Everybody,
>
> Today one of our developers (who comes from VSS) asked me a question 
> about svn and I have been unable to provide him with a decent answer; 
> I've been walking through google results and mailing list archives but 
> couldn't come up with a solution.
>
> I'll just say what he wants to do in case somebody has que same 
> question in mind:
>
> Is there such thing as "svn update --replace_existing_non_versioned" ?
>
> It is a file that already exists with the same name locally (is 
> unversioned) and you're bringing a new version from the repository. It 
> should ask "Replace Local" Yes/No.
> The thing is: if the file is versioned and is locally, svn will merge 
> (or try at least), but if the file is not there, there's a file exist 
> conflict. He wants a way to --force the update to replace the local file.
>
> He showed me a VSS option called "REPLACE LOCAL" that does exactly 
> this. I couldn't come up with a simple solution (except from manually 
> deleteing the "should be replaced locally stored files" by hand.
>
> Any insight?
This change has been implemented in trunk and thus will be part of 1.5.  
It either happens automatically, or you have to supply the --force 
parm.  I cannot remember which was finally decided.

Mark


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