On Jan 23, 2009, at 8:01 AM, Craig Vidler wrote:
... When diffing to resolve a conflict like this, HEAD vs [workingfile].mine using [workingfile] as the merge output is I think how things work with eg ZigVersion, which seems more intuitive in this respect. Does Versions not support this way of doing things? Is it expecting me to be dealing with conflicts by running Compare Diff and resolving before update or something like that? Am I missing something? ...
Actually, the file naming is done by the underlying Subversion libraries.
file.mine contains your locally-modified version file.rX contains the version you began editing withfile.rY contains the version now in the repository, which conflicts with file.mine file is modified to include annotations of what changed where, but it's not the easiest format to deal with.
You probably want to compare (in FileMerge or whatever) between file.rY and file.mine to avoid overwriting the changes made since rev X.
(I didn't have time to analyze your script in depth, but understanding the methodology of SVN helps understand why Versions does what it does.)
- Quinn
smime.p7s
Description: S/MIME cryptographic signature
