Re: updateing all but conflicting files

On Oct 30, 2007, at 08:30, Hari Kodungallur wrote:

> On 10/30/07, Jan Torben Heuer wrote:
>
>> can I update all changed files except those with conflicts? I want
>> to do the
>> merging stuff later, manually...
>
> You can not do it with an svn command. You can update everything
> and for each file that has a conflict, you can revert the changes
> manually. Then again, you might just be able to resolve the
> conflict in the same time :-)

I don't think that would work, Hari. If a file has conflicts when you
update, it means you had local uncommitted modifications before doing
the update. But "svn revert" removes all local modifications, which
you would not want in this case.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 30 23:02:52 2007