On 10/30/07, Ryan Schmidt <subversion-2007b@ryandesign.com> wrote:
>
>
> 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.
Oops. Sorry. You are right, Ryan.
What you want to do is copy the .mine to that file and then do an 'svn
resolved', I guess. Is that right?
thanks,
-Hari Kodungallur
Received on Wed Oct 31 00:27:15 2007