On Wed, Mar 03, 2010 at 02:02:03PM +0100, Andreas Jellinghaus wrote:
> Am Mittwoch 03 März 2010 12:27:30 schrieb Ralf Schlatterbeck:
> > On Wed, Mar 03, 2010 at 11:08:37AM +0100, Andreas Jellinghaus wrote:
> > > an alternative would be to move the files into the include directory.
> > > that wasn't done in the past, as cvs is a pain with moves. but with
> > > svn we can do that (although we break history that way - for svn
> > > it is one new object and one remove object, commands like "svn annotate"
> > > break with moves).
> >
> > Thats not true. SVN keeps the history for moved objects.
>
> yes it keeps the history. and it is mostly useless.
>
> svn annotate will only show the revision where the new file was
> added, and with svn log you can see it was a move (from the comment)
> and the old file name, and then you can checkout the revision before
> the move with the old files still in place, and run svn annotate
> again.
>
> so "svn annotate" breaks with "svn mv" - the data is still there
> inside the svn repository, but getting to that data is now very hard.
Not the way my SVN is working. Maybe you have actually done an
svn rm / svn add
combo instead of svn mv
A log:
svnadmin create /home/ralf/bla
cd
svn co file:///home/ralf/bla x
cd x
(echo 1 ; echo 2 ; echo 3) > testfile
svn add testfile
svn commit
(echo 4 ; echo 2 ; echo 6) >> testfile
svn commit
svn mv testfile testfile-new
svn commit
(echo 7 ; echo 8 ; echo 9) >> testfile-new
svn commit
svn annotate testfile-new
leads:
1 ralf 1
1 ralf 2
1 ralf 3
2 ralf 4
2 ralf 2
2 ralf 6
4 ralf 7
4 ralf 8
4 ralf 9
r...@bee:(965)% svn log
------------------------------------------------------------------------
r4 | ralf | 2010-03-03 14:17:59 +0100 (Wed, 03 Mar 2010) | 2 lines
- 7 8 9
------------------------------------------------------------------------
r3 | ralf | 2010-03-03 14:17:20 +0100 (Wed, 03 Mar 2010) | 2 lines
- moved to testfile-new
------------------------------------------------------------------------
r2 | ralf | 2010-03-03 14:17:05 +0100 (Wed, 03 Mar 2010) | 2 lines
- next 3 lines
------------------------------------------------------------------------
r1 | ralf | 2010-03-03 14:16:31 +0100 (Wed, 03 Mar 2010) | 2 lines
- first 3 lines
------------------------------------------------------------------------
which clearly shows the history before the 'svn mv'.
or do I misunderstand something here?
Ralf
--
Dr. Ralf Schlatterbeck Tel: +43/2243/26465-16
Open Source Consulting Fax: +43/2243/26465-23
Reichergasse 131 www: http://www.runtux.com
A-3411 Weidling email: off...@runtux.com
osAlliance member email: r...@osalliance.com
_______________________________________________
opensc-devel mailing list
opensc-devel@lists.opensc-project.org
http://www.opensc-project.org/mailman/listinfo/opensc-devel
