You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Thilo-Alexander Ginkel <ma...@tgbyte.com> on 2004/07/28 12:04:22 UTC
Merge bug? Files become directories during merge
Hello,
I have previously posted this message to dev@subversion, but did not
receive any response, so I am trying my luck on this list. Maybe
someone has experienced this problem before and is aware of a
work-around.
I am currently experiencing a problem with my subversion installation
[1], which already occurred [2] with recursive property changes in the
past: Files suddenly become directories when they are committed to the
repository after a merge.
Unfortunately, I am unable to create a simple test case to reproduce
the problem, so I am not sure which conditions cause it to appear. The
only thing I currently know is that it seems to be related to the
addition of files and directories to the trunk which previously only
existed in the branch.
The meta-data on the client seems to be intact after the commit, only
a new checkout or list reveals the data corruption on the server,
which suddenly contains additional directories.
An example:
The following correct directory/file layout is displayed during the
commit of the merge:
-- 8< --
Adding HTMLHelp SE
Adding HTMLHelp SE\Help
Adding HTMLHelp SE\Help\English
Adding HTMLHelp SE\Help\English\contents.hhc
Adding HTMLHelp SE\Help\English\css
Adding HTMLHelp SE\Help\English\css\style.css
Adding HTMLHelp SE\Help\English\html
Adding HTMLHelp SE\Help\English\html\errors
Adding HTMLHelp SE\Help\English\html\errors\tcard.html
Adding HTMLHelp SE\Help\English\html\generic
Adding HTMLHelp SE\Help\English\html\generic\contact.html
Adding HTMLHelp SE\Help\English\html\generic\copyright.html
Adding HTMLHelp SE\Help\English\html\generic\eula.html
Adding HTMLHelp SE\Help\English\html\generic\welcome.html
Adding HTMLHelp SE\Help\English\html\generic\whatsnew.html
Adding HTMLHelp SE\Help\English\html\overview
Adding HTMLHelp SE\Help\English\html\overview\cmdline.html
Adding HTMLHelp SE\Help\English\html\overview\dialogs
Adding HTMLHelp SE\Help\English\html\overview\dialogs\destination.html
Adding HTMLHelp SE\Help\English\html\overview\dialogs\eula.html
Adding HTMLHelp SE\Help\English\html\overview\dialogs\programfolder.html
Adding HTMLHelp SE\Help\English\html\overview\dialogs\readme.html
Adding HTMLHelp SE\Help\English\html\overview\dialogs\setupfinished.html
Adding HTMLHelp SE\Help\English\html\overview\dialogs\startcopyingfiles.html
Adding HTMLHelp SE\Help\English\html\overview\dialogs\uninstall.html
Adding HTMLHelp SE\Help\English\html\overview\dialogs\userinfo.html
Adding HTMLHelp SE\Help\English\html\overview\dialogs\welcome.html
Adding HTMLHelp SE\Help\English\html\overview\errors.html
Adding HTMLHelp SE\Help\English\html\overview\order.html
Adding HTMLHelp SE\Help\English\html\overview\packages.html
Adding HTMLHelp SE\Help\English\html\overview\setup.html
Adding HTMLHelp SE\Help\English\html\overview\unattended.html
Adding HTMLHelp SE\Help\English\html\overview\variables.html
Adding HTMLHelp SE\Help\English\html\tabs
Adding HTMLHelp SE\Help\English\html\tabs\createsetup.html
Adding HTMLHelp SE\Help\English\html\tabs\files.html
Adding HTMLHelp SE\Help\English\html\tabs\general.html
Adding HTMLHelp SE\Help\English\html\tabs\shortcuts.html
Adding HTMLHelp SE\Help\English\html\tabs\ui.html
Adding HTMLHelp SE\Help\English\images
Adding (bin) HTMLHelp SE\Help\English\images\arrowrt.gif
Adding (bin) HTMLHelp SE\Help\English\images\bkarrow.gif
Adding (bin) HTMLHelp SE\Help\English\images\chiclet.gif
Adding (bin) HTMLHelp SE\Help\English\images\close.gif
Adding (bin) HTMLHelp SE\Help\English\images\computer.gif
Adding (bin) HTMLHelp SE\Help\English\images\concept.gif
Adding (bin) HTMLHelp SE\Help\English\images\cshelp.gif
Adding (bin) HTMLHelp SE\Help\English\images\home.gif
Adding (bin) HTMLHelp SE\Help\English\images\onestep.gif
Adding (bin) HTMLHelp SE\Help\English\images\proced.gif
Adding (bin) HTMLHelp SE\Help\English\images\question.gif
Adding (bin) HTMLHelp SE\Help\English\images\setupspecialist_logo.gif
Adding (bin) HTMLHelp SE\Help\English\images\shortcut.gif
Adding (bin) HTMLHelp SE\Help\English\images\smallbut.gif
Adding (bin) HTMLHelp SE\Help\English\images\step1.gif
Adding (bin) HTMLHelp SE\Help\English\images\step2.gif
Adding (bin) HTMLHelp SE\Help\English\images\step3.gif
Adding (bin) HTMLHelp SE\Help\English\images\step4.gif
Adding (bin) HTMLHelp SE\Help\English\images\step5.gif
Adding (bin) HTMLHelp SE\Help\English\images\tgbyte_logo.gif
Adding HTMLHelp SE\Help\English\index.hhk
Adding HTMLHelp SE\Help\English\script
Adding HTMLHelp SE\Help\English\script\help.js
Adding HTMLHelp SE\Help\English\script\shared.js
Adding HTMLHelp SE\Help\English\sspeng.hhp
[...]
-- 8< --
After the commit, however, the repository contains the following
directory layout:
-- 8< --
[...]
4735 tg Jul 27 02:13 Help/
4735 tg Jul 27 02:13 Help/English/
[...]
4735 tg Jul 27 02:13 Help/English/contents.hhc/
4720 tg Jul 06 15:10 Help/English/contents.hhc/Help/
4720 tg Jul 06 15:10 Help/English/contents.hhc/Help/English/
4170 tg 7092 Jun 02 2002 Help/English/contents.hhc/Help/English/contents.hhc
4720 tg Jul 06 15:10 Help/English/contents.hhc/Help/English/css/
3057 tg 1929 Jan 07 2002 Help/English/contents.hhc/Help/English/css/style.css
4720 tg Jul 06 15:10 Help/English/contents.hhc/Help/English/html/
4720 tg Jul 06 15:10 Help/English/contents.hhc/Help/English/html/errors/
3058 tg 799 Jan 07 2002 Help/English/contents.hhc/Help/English/html/errors/tcard.html
4720 tg Jul 06 15:10 Help/English/contents.hhc/Help/English/html/generic/
4684 tg 1954 May 03 13:59 Help/English/contents.hhc/Help/English/html/generic/contact.html
3822 tg 1463 Apr 29 2002 Help/English/contents.hhc/Help/English/html/generic/copyright.html
3829 tg 10152 Apr 29 2002 Help/English/contents.hhc/Help/English/html/generic/eula.html
3823 tg 2082 Apr 29 2002 Help/English/contents.hhc/Help/English/html/generic/welcome.html
3824 tg 1085 Apr 29 2002 Help/English/contents.hhc/Help/English/html/generic/whatsnew.html
4720 tg Jul 06 15:10 Help/English/contents.hhc/Help/English/html/overview/
3932 tg 1496 May 06 2002 Help/English/contents.hhc/Help/English/html/overview/cmdline.html
4720 tg Jul 06 15:10 Help/English/contents.hhc/Help/English/html/overview/dialogs/
3140 tg 1798 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/billboards.html
3141 tg 1305 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/custom.html
3142 tg 2953 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/destination.html
3143 tg 1428 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/eula.html
3144 tg 1229 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/password.html
3145 tg 1426 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/programfolder.html
3146 tg 1391 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/readme.html
3147 tg 1444 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/setupfinished.html
3148 tg 1262 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/setuptype.html
3149 tg 1503 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/uninstall.html
3150 tg 2227 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/userinfo.html
3151 tg 1287 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/dialogs/welcome.html
3064 tg 5086 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/errors.html
3814 tg 3832 Apr 29 2002 Help/English/contents.hhc/Help/English/html/overview/order.html
3066 tg 1555 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/packages.html
3067 tg 2731 Jan 07 2002 Help/English/contents.hhc/Help/English/html/overview/setup.html
4430 tg 12462 Jul 16 2003 Help/English/contents.hhc/Help/English/html/overview/setupc.html
3815 tg 3164 Apr 29 2002 Help/English/contents.hhc/Help/English/html/overview/unattended.html
4431 tg 7167 Jul 16 2003 Help/English/contents.hhc/Help/English/html/overview/variables.html
3816 tg 1858 Apr 29 2002 Help/English/contents.hhc/Help/English/html/overview/websetup.html
4720 tg Jul 06 15:10 Help/English/contents.hhc/Help/English/html/tabs/
3490 tg 2436 Mar 29 2002 Help/English/contents.hhc/Help/English/html/tabs/createsetup.html
3491 tg 4574 Mar 29 2002 Help/English/contents.hhc/Help/English/html/tabs/files.html
3870 tg 3583 Apr 30 2002 Help/English/contents.hhc/Help/English/html/tabs/general.html
3493 tg 2748 Mar 29 2002 Help/English/contents.hhc/Help/English/html/tabs/ini.html
3494 tg 3195 Mar 29 2002 Help/English/contents.hhc/Help/English/html/tabs/registry.html
3495 tg 3373 Mar 29 2002 Help/English/contents.hhc/Help/English/html/tabs/requirements.html
3496 tg 2602 Mar 29 2002 Help/English/contents.hhc/Help/English/html/tabs/shortcuts.html
3497 tg 2884 Mar 29 2002 Help/English/contents.hhc/Help/English/html/tabs/startprograms.html
3498 tg 5243 Mar 29 2002 Help/English/contents.hhc/Help/English/html/tabs/ui.html
3499 tg 2122 Mar 29 2002 Help/English/contents.hhc/Help/English/html/tabs/variables.html
3500 tg 2918 Mar 29 2002 Help/English/contents.hhc/Help/English/html/tabs/vdesign.html
4720 tg Jul 06 15:10 Help/English/contents.hhc/Help/English/images/
3070 tg 70 Jan 07 2002 Help/English/contents.hhc/Help/English/images/arrowrt.gif
3071 tg 117 Jan 07 2002 Help/English/contents.hhc/Help/English/images/bkarrow.gif
3072 tg 870 Jan 07 2002 Help/English/contents.hhc/Help/English/images/chiclet.gif
3073 tg 850 Jan 07 2002 Help/English/contents.hhc/Help/English/images/close.gif
3074 tg 2001 Jan 07 2002 Help/English/contents.hhc/Help/English/images/computer.gif
3075 tg 148 Jan 07 2002 Help/English/contents.hhc/Help/English/images/concept.gif
3076 tg 829 Jan 07 2002 Help/English/contents.hhc/Help/English/images/cshelp.gif
3077 tg 921 Jan 07 2002 Help/English/contents.hhc/Help/English/images/home.gif
3078 tg 54 Jan 07 2002 Help/English/contents.hhc/Help/English/images/onestep.gif
3079 tg 160 Jan 07 2002 Help/English/contents.hhc/Help/English/images/proced.gif
3080 tg 135 Jan 07 2002 Help/English/contents.hhc/Help/English/images/question.gif
3081 tg 2420 Jan 07 2002 Help/English/contents.hhc/Help/English/images/setupspecialist_logo.gif
3082 tg 871 Jan 07 2002 Help/English/contents.hhc/Help/English/images/shortcut.gif
3083 tg 109 Jan 07 2002 Help/English/contents.hhc/Help/English/images/smallbut.gif
3084 tg 125 Jan 07 2002 Help/English/contents.hhc/Help/English/images/step1.gif
3085 tg 125 Jan 07 2002 Help/English/contents.hhc/Help/English/images/step2.gif
3086 tg 126 Jan 07 2002 Help/English/contents.hhc/Help/English/images/step3.gif
3087 tg 130 Jan 07 2002 Help/English/contents.hhc/Help/English/images/step4.gif
3088 tg 125 Jan 07 2002 Help/English/contents.hhc/Help/English/images/step5.gif
3089 tg 2202 Jan 07 2002 Help/English/contents.hhc/Help/English/images/tgbyte_logo.gif
3090 tg 203 Jan 07 2002 Help/English/contents.hhc/Help/English/index.hhk
4720 tg Jul 06 15:10 Help/English/contents.hhc/Help/English/script/
3091 tg 2551 Jan 07 2002 Help/English/contents.hhc/Help/English/script/help.js
3092 tg 39339 Jan 07 2002 Help/English/contents.hhc/Help/English/script/shared.js
4171 tg 1851 Jun 02 2002 Help/English/contents.hhc/Help/English/sspeng.hhp
[...]
-- 8< --
Each erratic sub-directory now contains a copy of the complete
directory sub-tree.
Any ideas?
Regards,
Thilo
[1] Client: svn, version 1.0.6 (r10360)
Server: svn, version 1.0.5 (r9954)
[2] http://subversion.tigris.org/issues/show_bug.cgi?id=1794
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merge bug? Files become directories during merge
Posted by Ben Collins-Sussman <su...@collab.net>.
On Thu, 2004-07-29 at 14:02, Thilo-Alexander Ginkel wrote:
> Ben Collins-Sussman wrote:
>
> >> Any ideas?
>
> > You really need to show us a transcript of your exact merge command, the
> > commit, and the resulting clean checkout. It's too difficult to
> > understand what's going on by just looking at these listings.
>
> All right. Is there any way to increase the verbosity of svn's logs?
SVN has no logging mechanism, other than the the standard server logs
that apache produces (and that assumes you're using apache as your
server, which you may not be.)
Just send us a transcript of your shell commands and results. We don't
need apache logs.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merge bug? Files become directories during merge
Posted by Thilo-Alexander Ginkel <ma...@tgbyte.com>.
Ben Collins-Sussman wrote:
>> Any ideas?
> You really need to show us a transcript of your exact merge command, the
> commit, and the resulting clean checkout. It's too difficult to
> understand what's going on by just looking at these listings.
All right. Is there any way to increase the verbosity of svn's logs? A
post in the mailing list archive mentioned setting the Apache
"LogLevel" to "debug" which I did. Unfortunately this does not seem to
increase the logging verbosity. Or is a standard Apache access log
sufficient?
Regards,
Thilo
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merge bug? Files become directories during merge
Posted by Ben Collins-Sussman <su...@collab.net>.
On Wed, 2004-07-28 at 07:04, Thilo-Alexander Ginkel wrote:
> Any ideas?
You really need to show us a transcript of your exact merge command, the
commit, and the resulting clean checkout. It's too difficult to
understand what's going on by just looking at these listings.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org