You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Steve Lhomme <st...@free.fr> on 2004/07/12 13:12:40 UTC

Request: clean update

Hi,

I have been trying to do a complete update without any success.
What I would like is to update the current dir with the latest 
repository data, erasing local changes if needed. But I only managed to 
get the diff merged in the problematic changes...

So I have tried using the --diff3-cmd command line but with no success. 
I wanted to use a script and only keep the new file. But the script is 
called with more than 100 parameters. So I don't know which one 
corresponds to the new file (only found the previous one).

Anybody have ideas on how to do this ? Or is there any plan to add a 
switch to the "update" command ?

thx

-- 
robUx4 on blog <http://robux4.blogspot.com/>


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

Re: Request: clean update

Posted by François Beausoleil <fb...@ftml.net>.

Steve Lhomme wrote:
> Hi,
> 
> I have been trying to do a complete update without any success.
> What I would like is to update the current dir with the latest 
> repository data, erasing local changes if needed. But I only managed to 
> get the diff merged in the problematic changes...

Hmm, you should look at svn revert

Bye,
François


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

Re: Request: clean update

Posted by Garrett Rooney <ro...@electricjellyfish.net>.
Steve Lhomme wrote:
> Hi,
> 
> I have been trying to do a complete update without any success.
> What I would like is to update the current dir with the latest 
> repository data, erasing local changes if needed. But I only managed to 
> get the diff merged in the problematic changes...
> 
> So I have tried using the --diff3-cmd command line but with no success. 
> I wanted to use a script and only keep the new file. But the script is 
> called with more than 100 parameters. So I don't know which one 
> corresponds to the new file (only found the previous one).
> 
> Anybody have ideas on how to do this ? Or is there any plan to add a 
> switch to the "update" command ?

First do a 'svn revert' to revert any local changes you want to blow 
away, then an 'svn update' to pull down the new ones.

-garrett

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