FileMerge error

Question

Level 5

5,063 points

FileMerge error

I am trying to get IB to merge the files back together. I get to through all the steps, then when it goes to do the merge, it has an error saying it "cannot copy file". I had been working on an extra drive, so I tried on local to ensure it was not a permissions error due to the extra drive set-up. Nope. Same error.

Anyone else get this error, or know what might be causing it. Luckily I am just starting out, and my programs are easy enough that I can add code to the appropriate (only) header and M files as needed, by hand. But I can foresee a time that it is going to be a little harder than that.

Thanks ahead of time,
Jason

Power Mac Dual 2.0 G5, Mac OS X (10.5.1)

Posted on Oct 19, 2008 7:46 PM

Reply

Answer 1

ericmeyers

Level 4

1,410 points

Oct 19, 2008 7:49 PM in response to jaxjason

Well that's strange. I know I've done that before. Anything show up in the Console Messages?

Reply

Answer 2

jaxjason Author

Level 5

5,063 points

Oct 24, 2008 10:03 AM in response to ericmeyers

nope, just the filemerge program. I was walking through a tutorial and it worked fine, until the second time I did a merge, and it failed. I made a new project, failed every time after the first.

Jason

Reply

Answer 3

jaxjason Author

Level 5

5,063 points

Nov 13, 2008 10:58 AM in response to jaxjason

Marking this as "solved" to get it off me "Unresolved list".

Still don't know why it won't work. It actually ended up being good for me to learn how to place all the object, methods etc... in the header and .m files by hand. helped in understanding what was going on.

Thanks for your try to help,
Jason

Reply

Answer 4

etresoft

Level 9

56,656 points

Nov 13, 2008 4:24 PM in response to jaxjason

Were you using the "-merge" flag? I actually have the following script:


#!/bin/sh
# Get a hold of the last parameter.
eval LAST=${$#}
# Now run opendiff with the previous version and the current version.
opendiff ${*} -merge "$LAST"

set up as my external merge program. It works much better than the default.

Reply

Answer 5

jaxjason Author

Level 5

5,063 points

Nov 14, 2008 4:07 PM in response to etresoft

I wasn't running it at all, IB runs it after you click the merge button upon "write files" command. I didn't even know you could run it from the command line with extra arguments.

Jason

Reply

Answer 6

etresoft

Level 9

56,656 points

Nov 15, 2008 1:28 PM in response to jaxjason

Sorry, I didn't notice you were talking about Interface Builder. I should have been paying more attention. Interface Builder is pretty flaky. Anything you can do without using Interface Builder, you should. I wouldn't trust it to merge changes into my files. Just continue to make changes in Xcode. At least the new Interface Builder is better at picking up those changes now.

Reply

Answer 7

jaxjason Author

Level 5

5,063 points

Nov 15, 2008 2:15 PM in response to etresoft

yeah, I use it to make my first set when I have completely empty class files. After that , as I add objects to my windows and need more actions etc... I just do it by hand. Am really glad I learned that though.

Thanks again though, all additional information is welcomed!

Jason

Reply