+1 for me.
Having recently moved from Perforce to SVN I'm a little surprised how poorly
supported merging is (in general). In the past we'd create branches for any
non-trivial development task and integrate back into the trunk only after
acceptance testing.
Whilst Perforce's clients are certainly
have any idea why it's
complaining about the file already existing. Are you branching with an
option-drag inside Versions? Does the same thing happen if you try it from
the command line?
- Quinn
On Jun 4, 2009, at 6:57 AM, Robin Charlton wrote:
Interesting.
If I branch and then attempt
I suspect this explains the weird problems I've experienced with XCode
project files (which are also bundles). Versions (or rather SVN) often
doesn't recognise them as being in the repository and/or complains that
'they already exist' when trying to submit.
~
Robin | m...@robincharlton.me |
and commits with irrelevant
files and changes.)
What specific problem is being reported? What are the filenames that are
claimed to already exist, and do they in fact exist?
- Quinn
On Jun 4, 2009, at 2:22 AM, Robin Charlton wrote:
I suspect this explains the weird problems I've experienced