Re: svn compare using FileMerge not storing to expected location
Re: svn compare using FileMerge not storing to expected location
- Subject: Re: svn compare using FileMerge not storing to expected location
- From: "Sean McBride" <email@hidden>
- Date: Tue, 14 Nov 2006 17:37:08 -0500
- Organization: Rogue Research
On 2006-11-12 00:39, Andrew Pontious said:
>> probably there is a obvious solution for this but i didnt find it...
>>
>> Subversion 1.4 (via svn:// protocol) and XCode 2.4.1 are up and
>> running.
>> Updating from and comitting to the repository work fine.
>>
>> When i have to solve a conflict between my current working copy file
>> and
>> a repository version FileMerge is in use to merge the modifications.
>> But when pressing "save merge" the merge result it asks me for a file.
>> Why that? I would expect that it will overwrite my working copy file
>> by
>> default...
>
>This is a known issue.
With Xcode/FileMerge or with svn 1.4?
I ask because this problem sounds somewhat similar to one I've started
having ever since I updated to svn 1.4 (and svnX 0.9.8 at the same time).
--
____________________________________________________________
Sean McBride, B. Eng email@hidden
Rogue Research www.rogue-research.com
Mac Software Developer Montréal, Québec, Canada
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden