On Sat, Nov 01, 2008 at 02:10:44AM +0100, Neels J. Hofmeyr wrote:
>
>
> Stephen Butler wrote:
> >>>>> In my example, the edits I made to this file were
> >>>>> actually automatically transferred to the new file ... Cool!.
> >>>> Wow, I wish I knew why :)
> >>
> >> Yeah, Steve, explain :)
> >
> > See update_tests.py 37-40 ("update should make use of copyfrom
> > args").
> >
> > In the second WC, if the new file is added before the old file is
> > deleted, then we use the old file as the source instead of asking
> > the repo. The magic is in add_file_with_history() and in
> > locate_copyfrom(). Blame tells me the magician was sussman, about
> > a year ago.
> >
> > If you include both files in a single commit, you tend not to
> > get the magic. For instance, in our tree conflict tests it
> > doesn't happen.
>
> Am I understanding this right: Instead of downloading the new file from the
> server, it uses some prior knowledge and assumes that the file on disk is
> actually what would be downloaded, and uses that instead?
See
http://subversion.tigris.org/svn_1.5_releasenotes.html#copy-move-improvements
> So getting the local mods in there is more like, say, an accident, right? Is
> this always safe? Is it checked to be?
Retaining the local mods is the goal of this feature.
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-02 21:02:07 CET