On Fri, Oct 26, 2007 at 02:04:19PM +0200, Nick.Thompson@infineon.com wrote:
> Yes, that's interesting and certainly related, but I don't think my
> use-case is quite as bad, though maybe not adequately described :-). In
> my case, the user has a *pristine* working copy from a branch that has
> had code refactored (relative to the trunk) but already committed.
You have Use Case 6 described in the paper attached to issue 2282.
At the moment we are trying to get the first 3 use cases sorted
out, the other ones will be dealt with later. See the paper for
the description of use case 6 (the paper is in power point format,
unfortunately).
> In this case the user doesn't get tree-conflicts as such (which can lead to
> revertions etc.) but rather the merge fails as the target files for some
> files being merged from the trunk do not have the same names on the
> branch (and hence in the working copy).
The user should get a tree conflict because the renames conflict.
How the conflict is dealt with is totally up to the user.
But Subversion should signal the conflict and possibly provide
some reasonable default solution.
> The difference here, is that a
> true rename function could allow the merge to complete with less
> difficulty than the UC's defined in the tree conflict scenarios.
We cannot implement true renames without removing the ability
of checking out subsets of the versioned directory tree stored
in the repository.
(At least according to Karl, that is the problem with true renames.)
> Duplicating the refactoring on the trunk (and committing it) before
> merging to the branch is the best solution I could think of in my case.
> Is there a best practice for my scenario that I failed to consider?
I'm not sure. I'm concerned with trying to fix the issue so
that subversion supports your use case as good as possible,
without workarounds.
--
Stefan Sperling <stsp@elego.de> Software Developer
elego Software Solutions GmbH HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96
13355 Berlin Fax: +49 30 23 45 86 95
http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
- application/pgp-signature attachment: stored
Received on Fri Oct 26 14:53:22 2007