Matthieu Moy a écrit :
> Benjamin Watine <watine@cines.fr> writes:
>
>> I've set up a repository for the sources of a project. A developper of
>> our team didn't use the repository, and did a lot of work ; he have
>> modified around 100 files.
>
> Did he rename any file?
>
>> I've tried this :
>> make a temp local repos with svn co
>
> You have to be carefull to "svn co" the revision the work is based on.
> If other developers commited since he started working, you have to
> merge their work with his.
>
>> delete the modified files in this new local repos (svn del, rm)
>> import the new modified file in the local repos (cp, svn add)
>
> Why "svn delele + svn add"? If they are the same files, the file is
> not deleted and re-added, it's just modified. Modify your local copy,
> check with status/diff, and commit.
>
> More precisely, if no renaming is involved, I'd do
>
> $ svn co -r <base revision for developer's work> ... dir/
> $ cd dir/
> $ cp -r /path/to/other/dev/work/* ./
> $ svn update
> $ svn status
> $ svn diff
> $ svn commit
>
> If files need to be renamed, you need to do that manually with "svn
> mv". If the developer added or deleted files, you need to say that
> explicitely too.
>
OK, I did what you said, and it works perfectly. But I don't know why my
"svn del + svn add" didn't work, even if it was not necessary.
Thank you for your help !
Ben
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 16 11:40:37 2007