[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

bug round 2

From: Michael Price <mprice_at_atl.lmco.com>
Date: 2002-12-02 03:21:25 CET

OK. The last "bug" I emailed was one I ran into while trying to come up
with a short recipe for the real bug that was annoying me. Here is the
recipe for the really annoying one.

Summary: "mv" on two working copy directories can result in the files
contained in that directory no longer appearing in the working copy.

There is another bug I'm trying to come up with a short recipe for where
instead of no file at all you get old contents for the directory (from
several revisions back).

Michael

$ ~/tmp> dir
$ ~/tmp> svn co http://jail/svn/test
Checked out revision 0.
$ ~/tmp> cd test
$ ~/tmp/test> svn mkdir "dir1"
A dir1
$ ~/tmp/test> cd dir1
$ ~/tmp/test/dir1> svn mkdir dir2
A dir2
$ ~/tmp/test/dir1> cd ..
$ ~/tmp/test> svn commit -m "new dirs"
Adding dir1
Adding dir1/dir2

Committed revision 1.
$ ~/tmp/test> cd dir1
$ ~/tmp/test/dir1> cd dir2
$ ~/tmp/test/dir1/dir2> echo "file" > file1
$ ~/tmp/test/dir1/dir2> svn add file1
A file1
$ ~/tmp/test/dir1/dir2> svn commit -m "new file"
Adding dir2/file1
Transmitting file data .
Committed revision 2.
$ ~/tmp/test/dir1/dir2> echo "new" > file2
$ ~/tmp/test/dir1/dir2> svn add file2
A file2
$ ~/tmp/test/dir1/dir2> svn rm file1
D file1
$ ~/tmp/test/dir1/dir2> svn commit -m "delete one add one"
Deleting dir2/file1
Adding dir2/file2
Transmitting file data .
Committed revision 3.
$ ~/tmp/test/dir1/dir2> cd ..
$ ~/tmp/test/dir1> cd ..
$ ~/tmp/test> svn mkdir newdir
A newdir
$ ~/tmp/test> svn commit -m "director"
Adding newdir

Committed revision 4.
$ ~/tmp/test> svn mv dir1 newdir
A newdir/dir1
D dir1/dir2/file2
D dir1/dir2
D dir1
$ ~/tmp/test> svn commit -m "mv"
Deleting dir1
Adding newdir/dir1
Adding newdir/dir1/dir2/file2

Committed revision 5.
$ ~/tmp/test> dir newdir/dir1/dir2
total 2
-rw------- 1 mixtim mixtim 4 Dec 1 21:13 file2
$ ~/tmp/test> svn update
At revision 5.
$ ~/tmp/test> cd ..
$ ~/tmp> rm -fr test
$ ~/tmp> svn co http://jail/svn/test
A test/newdir
A test/newdir/dir1
A test/newdir/dir1/dir2
Checked out revision 5.
$ ~/tmp> cd test/newdir/dir1/dir2
$ ~/tmp/test/newdir/dir1/dir2> dir
$ ~/tmp/test/newdir/dir1/dir2> svn update
At revision 5.
$ ~/tmp/test/newdir/dir1/dir2> dir
$ ~/tmp/test/newdir/dir1/dir2> cd ..
$ ~/tmp/test/newdir/dir1> cd ..
$ ~/tmp/test/newdir> cd ..
$ ~/tmp/test> svn merge -r 5:4 .
A dir1
A dir1/dir2
A dir1/dir2/file2
D newdir/dir1
$ ~/tmp/test> svn commit -m "huh?"
Adding dir1
Deleting newdir/dir1

Committed revision 6.
$ ~/tmp/test> cd dir1
$ ~/tmp/test/dir1> cd dir2
$ ~/tmp/test/dir1/dir2> dir
total 2
-rw------- 1 mixtim mixtim 4 Dec 1 21:16 file2
$ ~/tmp/test/dir1/dir2> cat file2
new

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 2 03:24:10 2002

This is an archived mail posted to the Subversion Dev mailing list.