SVN cant provide conflict files because it has no base to perform a 3
way diff on. It would have no idea how to merge the two files.
Complete user merging is the only way to solve this problem
On 5/13/07, Talden <talden@gmail.com> wrote:
> 1. Does the tool provide the feedback to the second developer to
> resolve the problem.
> 2. Is the resolution straightforward enough to apply without a visit
> to documentation or using tools not common to the usual workflow.
>
> Subversion seems to provide for the first point well enough. The
> attempted commit produces
>
> "svn: File already exists: filesystem 'C:/_repositories/svn/db',
> transaction '8-1', path 'thefile.txt"
>
> and updating produces
>
> "svn: Failed to add file 'thefile.txt': object of the same name
> already exists"
>
>
> I'm not sure that the second part is addressed as well. Dev B can
> certainly revert his file, rename it and do an update for get the
> content from Dev A. Now however Dev B has to manually merge his
> content into Dev A's file before committing his content. It might be
> better, in the conflict update case to output the appropriate message
> but also provide the conflict files
>
> "thefile.txt.mine"
> "thefile.txt.r0" (an empty file)
> "thefile.txt.rN" (where N is the newly updated revision from Dev A)
>
> Now Dev B can use their usual work-flow for conflict resolution to
> merge the content. This task is likely to be much more familiar to
> the developer.
>
> --
> Talden
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun May 13 19:46:52 2007