On 10/25/07, Freddie A. <freddie.alberts@gmail.com> wrote:
> Hi Ben!
>
> I retried the scenario I presented with Subversion 1.5, and it doesn't
> really work; foo is kept in the directory but is not merged with bar, maybe
> I was a bit vague about my scenario sorry for that, here is exactly what I
> do:
>
> mkdir try ##USER 1's wc##
> mkdir try1 ##USER 2's wc##
>
> svnadmin create path_to_repos
>
> svn mkdir path_to_repos/proj -m ''
> svn mkdir path_to_repos/proj/trunk -m ''
>
> ###USER 1##
> cd try
> svn co path_to_repos/proj/trunk
> cd trunk
> touch foo
> svn add foo
> svn commit -m ''
>
> ##USER 2##
> cd try1
> svn co $REPOS/proj/trunk
> cd trunk
> svn rename foo bar
>
> ##USER 1##
> cd try/trunk
> echo "HELLO WORLD" > foo
>
> ##USER 2##
> cd try1/trunk
> svn commit -m ''
>
> ##USER 1##
> cd try/trunk
> svn update
>
> Here is the problem I wanted to talk about. The "HELLO WORLD" line is not
> included in bar (@try/trunk) after the update. However, foo still exists in
> try/trunk (not under version control).
>
> Maybe I'm working on the wrong revision, i just did a checkout of the latest
> version (v.1.5 r27371).
>
Your script is exactly the scenario we just solved. Or, rather,
*sometimes* solve. If the update deletes foo before adding bar, then
it doesn't work. But if the update adds bar first, then the
locally-modified foo is actually copied to bar. We have 3 unit-tests
that demonstrate this scenario, and they're passing now.
As I explained in an earlier mail, we have a plan to fix the situation
where the delete happens first, and it would be great if you'd like to
help with that.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 25 18:44:31 2007