Re: Re[2]: Merge of deleted file with a modified one

On 2006-1-6 Garrett Rooney <rooneg@electricjellyfish.net> wrote:
> Out of curiosity, do you know of another system that avoids this
> issue? If so, what kind of behavior does it have?

For comparison (don't shoot the messenger, etc) in this case,
perforce complains and requires the user to pass a flag to allow
the delete.

For the reverse case, a file deleted in main but edited in the
new-branch, the merge from new-branch->main will also require a
flag. (Adding it will re-branch the file. I.e., it appears as
a copy from the branch.) Svn reports "Skipped missing target:
'foo'".

-- bart

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 11 01:49:40 2006