On 6/16/08, Giulio Troccoli <Giulio.Troccoli_at_uk.linedata.com> wrote:
> > On Monday 16 June 2008, Giulio Troccoli wrote:
> > > ln1sub01 branches> mkdir french
> > > ln1sub01 branches> cp italian/foo.c french
> > > ln1sub01 branches> svn add french
> >
> > Try it this way:
> >
> > svn mkdir french (or: mkdir french ; svn add french)
> > svn cp italian/foo.c French
>
> Marc, you missed the point. The problem is not whether to retain the
> history of the file or not. The problem is that trunk/French did not
> exist at all prior to the merging, so how can Subversion replace a file
> (trunk/french/foo.c) that did not exist in the first place?
>
> Just out of thoroughness though I tried as you suggested (and as Andreas
> suggested too) and the result is the same
>
> ln1sub01 branches> svn mkdir spanish
> A spanish
> ln1sub01 branches> svn cp italian/foo.c spanish
> A spanish/foo.c
> ln1sub01 branches> svn ci -m"Adding Spanish"
> Adding branches/spanish
> Adding branches/spanish/foo.c
>
> Committed revision 18.
> ln1sub01 branches> cd ..
> ln1sub01 svn-test> svn merge -c18 http://localhost/svn-test/branches
> trunk
> A trunk/spanish
> A trunk/spanish/foo.c
> ln1sub01 svn-test> svn ci -m"Merging revision 18 to trunk"
> Adding trunk/spanish
> Adding trunk/spanish/foo.c
>
> Committed revision 19.
> ln1sub01 svn-test> svnlook changed -r19 /data/TestRepositories/svn-test
> A trunk/spanish/
> D trunk/spanish/foo.c
> A trunk/spanish/foo.c
I think you're seeing:
http://subversion.tigris.org/issues/show_bug.cgi?id=1962
Am I right?
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-16 15:29:38 CEST