On 8/30/07, Mark Phippard <markphip@gmail.com> wrote:
> 1) User has local edits in a file. In this scenario, Subversion
> never removes the file from disk, it just makes it unversioned. So
> even in the scenario where Subversion deletes the file, before sending
> the copy, the local file is still going to be on disk and you should
> still be able to find it to copy it. Situations where you cannot
> ought to be fairly rare, error conditions.
Correct.
>
> 2) User has made edits on a branch. Merge moves the file, causing
> the edits on the branch to be lost. Your notes file does not
> specifically talk about this scenario, but I assume it is just a
> variant of the same scenario. In this case, if the local file is
> available we copy it, if it is not available, we have the information
> we need to copy it from the server. Meaning, the branch version of
> the file is first copied to the new location, and then text deltas are
> applied.
Right, this is about merging, whereas the first scenario is about updating.
I *do* intend to solve the problem for both updates and merges, but
they're different codepaths. I'm only working on updates at the
moment -- which mainly involve making the libsvn_wc 'update editor'
vtable smarter about handling copyfrom-data coming from the server.
When it comes to solving the problem for merges, we need to make the
merging-vtable "smart" in the same way.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 30 23:30:32 2007