• Open Menu Close Menu
  • Apple
  • Shopping Bag
  • Apple
  • Mac
  • iPad
  • iPhone
  • Watch
  • TV
  • Music
  • Support
  • Search apple.com
  • Shopping Bag

Lists

Open Menu Close Menu
  • Terms and Conditions
  • Lists hosted on this site
  • Email the Postmaster
  • Tips for posting to public mailing lists
svn compare using FileMerge not storing to expected location
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

svn compare using FileMerge not storing to expected location


  • Subject: svn compare using FileMerge not storing to expected location
  • From: Michael Siek <email@hidden>
  • Date: Sat, 11 Nov 2006 11:42:56 +0100 (CET)
  • Organization: comosoft AG

hi all,
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...

What is the way to achieve that?

Thanks in advance,
Michael

 _______________________________________________
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

  • Follow-Ups:
    • Re: svn compare using FileMerge not storing to expected location
      • From: Andrew Pontious <email@hidden>
References: 
 >Localising a Help File (From: "Marc Wan" <email@hidden>)
 >Re: Localising a Help File (From: Bernard Desgraupes <email@hidden>)
 >Re: Localising a Help File (From: "Marc Wan" <email@hidden>)
 >Re: Localising a Help File (From: "Marc Wan" <email@hidden>)

  • Prev by Date: Re: Applescript: making many new file references in bulk
  • Next by Date: Installing carbon event handlers into a cocoa application.
  • Previous by thread: Re: Localising a Help File
  • Next by thread: Re: svn compare using FileMerge not storing to expected location
  • Index(es):
    • Date
    • Thread