I see what you guys are saying.
My problem is not the merge, but the conflict. We have a very large
repository with several solutions in it. Since not everyone builds all the
solutions at all times (takes too long) we have to version some of the
binaries into a common location (usually the project directory).
What I'm looking for (which might not be the right thing to do, but...) is a
way to not have svn tell me that there's a conflict between my dll and the
one in the head, but let me use the one from the HEAD automatically. This is
because in almost all cases, I will rebuild the solution and have the WC
updated immediately.
I asked to be able to do this manually from the update dialog - i.e., see
that there is a conflict - rmb on the conflicted file - select 'use HEAD'
and presto - the conflict is resolved. It would also be ok if it were done
automatically via svn. I don't want to have to do it manually...
Amir Kolsky
XP& Software
>-----Original Message-----
>From: Nicklas Norling [mailto:exinor@exinor.net]
>Sent: Sunday, May 01, 2005 9:21 PM
>To: dev@tortoisesvn.tigris.org
>Subject: Re: [TSVN] Application/octetstream
>
>Amir Kolsky wrote:
>
>> Someone suggested that with said mime type svn will not attampt a
>> merge. Well, .dll are automatically given this type and
>merge is still
>> attempted. Any ideas?
>>
>> Amir Kolsky
>> XP& Software
>>
>
>I think that might have been me. I also think I told you that
>it will still need a merge, but that it will leave the binary
>files on disk in all it's versions and expect you to check
>them out and merge manually.
>Well, that's assuming you've actually made local changes,
>otherwise svn can just replace the file.
>
>When you say 'merge is still attempted', what exactly do you mean?
>
>B.t.w. it's not a good idea to version dll's if you have the
>corresponding source code in the repo, but that's unrelated.
>
>/Nicke
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
>For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon May 2 01:15:55 2005