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

Re: BUG: mixing file:// and http:// import will mess sometimes repository

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-04-15 17:59:48 CEST

Jani Averbach <jaa@cc.jyu.fi> writes:

> [16:20:15] ~/txt
> jaa @ eowyn 14 $ svn import -m 'foobar' file:///home/data/jaa/svn/repo1/ . txt
> Adding ./txt
> Adding ./txt/Mylly.txt
> Adding ./txt/AlaSanoEttaRakastat.txt
> Adding ./txt/neilikka.txt
> Adding ./txt/Lasi.txt
> Adding ./txt/Kurski.txt
> Adding ./txt/NoManIsAnIland.txt
> Adding ./txt/muza.txt
> Adding ./txt/KiltitMiehet.txt
> Adding ./txt/losers_and_winners.txt
> Adding ./txt/rakkaudesta.txt
> Adding ./txt/Koirasoturit.txt
> Adding ./txt/MyrskyLuodonMaija.txt
> Adding ./txt/ascii_ribbon.txt
> Transmitting file data .............
>
> Committed revision 1.

The first import/commit. Everything is OK.

[snip]

> jaa @ eowyn 19 $ svn import file:///home/data/jaa/svn/repo1/ . txt
>
> Log message unchanged or not specified
> a)bort, c)ontinue, e)dit
> c
>
> subversion/libsvn_fs/tree.c:203
> svn_error: #21068 : <File already exists in revision>
> file already exists: filesystem `/home/data/jaa/svn/repo1/db', transaction `3', path `txt'

This is the correct error message, it is a conflict because you are
trying to create the same files again. Everything is OK.

>
>
> [16:21:27] ~/txt
> jaa @ eowyn 20 $ svn import file:///home/data/jaa/svn/repo1/ .
>
> Log message unchanged or not specified
> a)bort, c)ontinue, e)dit
> c
> Adding ./Mylly.txt
> Adding ./AlaSanoEttaRakastat.txt
> Adding ./neilikka.txt
> Adding ./Lasi.txt
> Adding ./Kurski.txt
> Adding ./NoManIsAnIland.txt
> Adding ./muza.txt
> Adding ./KiltitMiehet.txt
> Adding ./losers_and_winners.txt
> Adding ./rakkaudesta.txt
> Adding ./Koirasoturit.txt
> Adding ./MyrskyLuodonMaija.txt
> Adding ./ascii_ribbon.txt
> Transmitting file data .............
>
> Committed revision 2.

This is the second commit, note the different paths so it is not a
conflict. You now have two separate sets of files, one under / and one
under /txt/. You have done something odd, but everything is OK.

[snip]

> jaa @ eowyn 22 $ svn import file:///home/data/jaa/svn/repo1/txt txt/
>
> Log message unchanged or not specified
> a)bort, c)ontinue, e)dit
> c
>
> subversion/libsvn_fs/tree.c:203
> svn_error: #21068 : <File already exists in revision>
> file already exists: filesystem `/home/data/jaa/svn/repo1/db', transaction `5', path `/txt/MyrskyLuodonMaija.txt'
>
> [16:21:57] ~
> jaa @ eowyn 23 $ svn import file:///home/data/jaa/svn/repo1/ txt
>
> Log message unchanged or not specified
> a)bort, c)ontinue, e)dit
> c
>
> subversion/libsvn_fs/tree.c:203
> svn_error: #21068 : <File already exists in revision>
> file already exists: filesystem `/home/data/jaa/svn/repo1/db', transaction `6', path `M
>

Both of these show the correct error message. You are trying to add a
file that already exists. Everything is OK.

[snip]

> [16:22:55] ~
> jaa @ eowyn 25 $ svn import -m 'foobar' http://localhost/svn/repos/txt txt/
> Adding ./Mylly.txt
> Adding ./AlaSanoEttaRakastat.txt
> Adding ./neilikka.txt
> Adding ./Lasi.txt
> Adding ./Kurski.txt
> Adding ./NoManIsAnIland.txt
> Adding ./muza.txt
> Adding ./KiltitMiehet.txt
> Adding ./losers_and_winners.txt
> Adding ./rakkaudesta.txt
> Adding ./Koirasoturit.txt
> Adding ./MyrskyLuodonMaija.txt
> Adding ./ascii_ribbon.txt
> Transmitting file data .............
>
> Committed revision 3.

Uh-oh trouble! This looks like issue 644. It appears that this issue
affects import as well as commit (no real surprise there). See
http://subversion.tigris.org/issues/show_bug.cgi?id=644

This should be a conflict, but it is not detected over ra_dav. If
subversion were working this commit would fail like the file: ones. I
don't know how well the repository will work after this.

>
> [16:23:16] ~
> jaa @ eowyn 26 $ svn import -m 'foobar' http://localhost/svn/repos/txt/ txt/
> Adding ./Mylly.txt
> Adding ./AlaSanoEttaRakastat.txt
> Adding ./neilikka.txt
> Adding ./Lasi.txt
> Adding ./Kurski.txt
> Adding ./NoManIsAnIland.txt
> Adding ./muza.txt
> Adding ./KiltitMiehet.txt
> Adding ./losers_and_winners.txt
> Adding ./rakkaudesta.txt
> Adding ./Koirasoturit.txt
> Adding ./MyrskyLuodonMaija.txt
> Adding ./ascii_ribbon.txt
> Transmitting file data .............
>
> Committed revision 4.

Same again, this is issue 644, it should fail.

[snip]

> jaa @ eowyn 21 $ svn co file:///home/data/jaa/svn/repo1/txt
> A txt/MyrskyLuodonMaija.txt
> A txt/ascii_ribbon.txt
> A txt/Mylly.txt
> A txt/neilikka.txt
> A txt/AlaSanoEttaRakastat.txt
> A txt/Kurski.txt
> A txt/Lasi.txt
> A txt/NoManIsAnIland.txt
> A txt/KiltitMiehet.txt
> A txt/muza.txt
> A txt/losers_and_winners.txt
> A txt/Koirasoturit.txt
> A txt/rakkaudesta.txt
>

You have checked out part of the repository, so that bit works.

[snip]

> [16:24:38] ~/junk/tmp/txt
> jaa @ eowyn 24 $ date >> neilikka.txt
>
> [16:24:43] ~/junk/tmp/txt
> jaa @ eowyn 25 $ svn ci -m 'foobar' neilikka.txt
> Sending neilikka.txt
>
> subversion/libsvn_client/commit.c:590
> svn_error: #21062 : <Filesystem has no such node-rev-id>
> Commit failed (details follow):
>
> subversion/libsvn_ra_dav/util.c:161
> svn_error: #21062 : <Filesystem has no such node-rev-id>
>
> reference to non-existent node `762.2' in filesystem `/home/data/jaa/svn/repo1/db'

Not sure why this fails, but it is possible the imports that failed to
conflict have indeed messed up the repository.

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 15 18:24:06 2002

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