All,
I did some tests WRT the lost subversion history of documentation files,
that happened recently.
Still I don't know, if it is a subversion bug or a feature ;-P , but
IMHO it looks more like a bug.
I found out that moving directories and copying files into these
directories, and moving the directory again, before committing the
changes, works as expected. History is retained. See appended file
test.txt, test case #1 and #2. (I used a local, existing subversion
repository with some history data).
But: adding a new (empty) directory, moving files from another directory
into this directory, then moving this directory again ... This results
in lost history information (see test case #3).
This seems to be what happened ...
Thus, we should take care, not to do multiple moves of files without
committing the changes step by step, because this _should_ prevent the
loss of history information. Hopefully.
Albrecht
------------
TEST CASE #1
------------
$ svn move documentation/ doc_new/
A doc_new
D documentation/fl_choice.gif
D documentation/Fl_Value_Input.html
D documentation/Fl_Menu_Window.html
[...]
D documentation/fluid.man
D documentation/glut.html
D documentation
After this, both dir's exist (locally), but documentation dir is empty.
History is not available _before_ commit:
svn log doc_new/functions.html
svn: File not found: revision 517, path '/trunk/fltk/doc_new/functions.html'
$ svn ci
Adding doc_new
Deleting documentation
Committed revision 518.
After this, the local documentation dir. is deleted.
$ svn log doc_new/functions.html
------------------------------------------------------------------------
r518 | Albrecht | 2008-10-19 19:10:50 +0200 (Sun, 19 Oct 2008) | 3 lines
renamed documentation dir. to doc_new
**> svn move documentation/ doc_new/
------------------------------------------------------------------------
r356 | albrecht | 2008-02-26 20:52:13 +0100 (Tue, 26 Feb 2008) | 22 lines
------------------------------------------------------------------------
[...] and more: history *is* available.
------------------------------------------------------------------------
$ svn pl -v doc_new/
Properties on 'doc_new':
svn:ignore : .xvpics
blocks.0
blocks.6
blocks.z
checkers.0
checkers.6
checkers.z
fltk.0
fltk.3
fltk-config.0
fltk-config.1
fltk-config.z
fltk.d
fltk.pdf
fltk.ps
fltk.z
fluid.0
fluid.1
fluid.z
sudoku.0
sudoku.6
sudoku.z
*.bck
svn:mergeinfo :
New dir. doc_new has an empty svn:mergeinfo property.
$ svn pl -v doc_new/functions.html
Properties on 'doc_new/functions.html':
svn:executable :
functions.html doesn't have svn:mergeinfo property.
------------
TEST CASE #2
------------
$ svn move doc_new doc_2
A doc_2
D doc_new/fl_choice.gif
D doc_new/Fl_Value_Input.html
[...]
D doc_new/glut.html
D doc_new
$ svn copy Makefile doc_2/copied_Makefile
A doc_2/copied_Makefile
$ svn move doc_2 doc_3
A doc_3
D doc_2
$ svn copy Makefile doc_3/copied_Makefile_doc_3
A doc_3/copied_Makefile_doc_3
$ svn ci
Adding doc_3
Adding doc_3/copied_Makefile
Adding doc_3/copied_Makefile_doc_3
Deleting doc_new
Committed revision 519.
----------
results:
----------
$ svn log doc_3/Makefile
------------------------------------------------------------------------
r519 | Albrecht | 2008-10-19 19:25:34 +0200 (Sun, 19 Oct 2008) | 13 lines
$ svn move doc_new doc_2
$ svn copy Makefile doc_2/copied_Makefile
$ svn move doc_2 doc_3
$ svn copy Makefile doc_3/copied_Makefile_doc_3
$ svn ci
A + doc_3
AM + doc_3/copied_Makefile
AM + doc_3/copied_Makefile_doc_3
D doc_new
------------------------------------------------------------------------
r518 | Albrecht | 2008-10-19 19:10:50 +0200 (Sun, 19 Oct 2008) | 3 lines
renamed documentation dir. to doc_new
**> svn move documentation/ doc_new/
------------------------------------------------------------------------
r269 | albrecht | 2007-09-23 22:36:17 +0200 (Sun, 23 Sep 2007) | 2 lines
------------------------------------------------------------------------
r36 | albrecht | 2006-11-20 15:58:55 +0100 (Mon, 20 Nov 2006) | 2 lines
------------------------------------------------------------------------
r5 | albrecht | 2006-10-27 19:55:19 +0200 (Fri, 27 Oct 2006) | 3 lines
------------------------------------------------------------------------
$ svn log doc_3/copied_Makefile
------------------------------------------------------------------------
r519 | Albrecht | 2008-10-19 19:25:34 +0200 (Sun, 19 Oct 2008) | 13 lines
$ svn move doc_new doc_2
$ svn copy Makefile doc_2/copied_Makefile
$ svn move doc_2 doc_3
$ svn copy Makefile doc_3/copied_Makefile_doc_3
$ svn ci
A + doc_3
AM + doc_3/copied_Makefile
AM + doc_3/copied_Makefile_doc_3
D doc_new
------------------------------------------------------------------------
r356 | albrecht | 2008-02-26 20:52:13 +0100 (Tue, 26 Feb 2008) | 22 lines
------------------------------------------------------------------------
r269 | albrecht | 2007-09-23 22:36:17 +0200 (Sun, 23 Sep 2007) | 2 lines
------------------------------------------------------------------------
r36 | albrecht | 2006-11-20 15:58:55 +0100 (Mon, 20 Nov 2006) | 2 lines
------------------------------------------------------------------------
r5 | albrecht | 2006-10-27 19:55:19 +0200 (Fri, 27 Oct 2006) | 3 lines
------------------------------------------------------------------------
$ svn log doc_3/copied_Makefile_doc_3
------------------------------------------------------------------------
r519 | Albrecht | 2008-10-19 19:25:34 +0200 (Sun, 19 Oct 2008) | 13 lines
$ svn move doc_new doc_2
$ svn copy Makefile doc_2/copied_Makefile
$ svn move doc_2 doc_3
$ svn copy Makefile doc_3/copied_Makefile_doc_3
$ svn ci
A + doc_3
AM + doc_3/copied_Makefile
AM + doc_3/copied_Makefile_doc_3
D doc_new
------------------------------------------------------------------------
r356 | albrecht | 2008-02-26 20:52:13 +0100 (Tue, 26 Feb 2008) | 22 lines
------------------------------------------------------------------------
r269 | albrecht | 2007-09-23 22:36:17 +0200 (Sun, 23 Sep 2007) | 2 lines
------------------------------------------------------------------------
r36 | albrecht | 2006-11-20 15:58:55 +0100 (Mon, 20 Nov 2006) | 2 lines
------------------------------------------------------------------------
r5 | albrecht | 2006-10-27 19:55:19 +0200 (Fri, 27 Oct 2006) | 3 lines
------------------------------------------------------------------------
------------
TEST CASE #3
------------
$ mkdir doc_4
$ svn add doc_4
A doc_4
$ svn move doc_3/* doc_4/
A doc_4/FL.gif
D doc_3/FL.gif
A doc_4/Fl.html
D doc_3/Fl.html
[...]
A doc_4/widgets.html
D doc_3/widgets.html
$ svn move doc_4 documentation
A documentation
A documentation/adjuster1.gif
A documentation/advanced.html
A documentation/basics.html
[...]
A documentation/value_slider.gif
A documentation/widgets.html
D doc_4
$ svn ci
Deleting doc_3/FL.gif
Deleting doc_3/Fl.html
Deleting doc_3/Fl_Adjuster.html
[...]
Deleting doc_3/value_slider.gif
Deleting doc_3/widgets.html
Adding documentation
Adding documentation/FL.gif
[...]
Adding documentation/value_slider.gif
Adding documentation/widgets.html
Transmitting file data
...................................................................................................................................................................................
Committed revision 520.
$ svn log -rhead
------------------------------------------------------------------------
r520 | Albrecht | 2008-10-19 19:44:33 +0200 (Sun, 19 Oct 2008) | 23 lines
$ mkdir doc_4
$ svn move doc_3/* doc_4/
A doc_4/FL.gif
D doc_3/FL.gif
A doc_4/Fl.html
D doc_3/Fl.html
[...]
A doc_4/widgets.html
D doc_3/widgets.html
$ svn move doc_4 documentation
A documentation
A documentation/adjuster1.gif
A documentation/advanced.html
A documentation/basics.html
[...]
A documentation/value_slider.gif
A documentation/widgets.html
D doc_4
$ svn ci ...
------------------------------------------------------------------------
====================================
*** Now, history *is* lost !!! :-(
====================================
$ svn log documentation/functions.html
------------------------------------------------------------------------
r520 | Albrecht | 2008-10-19 19:44:33 +0200 (Sun, 19 Oct 2008) | 23 lines
TEST #3:
$ mkdir doc_4
$ svn move doc_3/* doc_4/
A doc_4/FL.gif
D doc_3/FL.gif
A doc_4/Fl.html
D doc_3/Fl.html
[...]
A doc_4/widgets.html
D doc_3/widgets.html
$ svn move doc_4 documentation
A documentation
A documentation/adjuster1.gif
A documentation/advanced.html
A documentation/basics.html
[...]
A documentation/value_slider.gif
A documentation/widgets.html
D doc_4
$ svn ci ...
------------------------------------------------------------------------
$ svn log documentation/copied_Makefile_doc_3
------------------------------------------------------------------------
r520 | Albrecht | 2008-10-19 19:44:33 +0200 (Sun, 19 Oct 2008) | 23 lines
TEST #3:
$ mkdir doc_4
$ svn move doc_3/* doc_4/
A doc_4/FL.gif
D doc_3/FL.gif
A doc_4/Fl.html
D doc_3/Fl.html
[...]
A doc_4/widgets.html
D doc_3/widgets.html
$ svn move doc_4 documentation
A documentation
A documentation/adjuster1.gif
A documentation/advanced.html
A documentation/basics.html
[...]
A documentation/value_slider.gif
A documentation/widgets.html
D doc_4
$ svn ci ...
------------------------------------------------------------------------
_______________________________________________
fltk-dev mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-dev
