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

Subversion bug: merge and commit of folders and files

From: Aline Tetzlaff <Aline.Tetzlaff_at_msg-systems.com>
Date: Fri, 22 Apr 2016 07:53:12 +0000

Hello,

 

I've recognized the following strange behavior of Subversion - in my opinion
it's a bug:

 

1. Create a trunk with one project.

2. Create a branch based upon the trunk.

3. Commit a new folder including files into the branch (e.g.
MyFolder_2 with MyFile_1.txt and MyFile_2.txt).

4. Merge the branch revision back into the trunk.

 

Result: Only the folder is marked as "added" but not the files. Therefore it
seems that the files are already committed into the trunk (see screenshot
2a_Commit_Subversive.png).

 

There are also other users with this problem:

 

http://stackoverflow.com/questions/25182236/svn-status-is-normal-instead-of-
added

 

 
<https://sharpsvn.open.collab.net/ds/viewMessage.do?dsForumId=728&dsMessageI
d=509387>
https://sharpsvn.open.collab.net/ds/viewMessage.do?dsForumId=728&dsMessageId
=509387

 

Mit freundlichen Grüßen
Aline Tetzlaff

Senior IT Consultant
msg.PM Development
GB P - Products

msg systems ag
Zwickauer Str. 16a
09112 Chemnitz
Deutschland

Tel.: +49 371 67403 6618
Fax: +49 371 67403 6613
E-Mail: <mailto:aline.tetzlaff_at_msg-systems.com>
aline.tetzlaff_at_msg-systems.com

 <http://www.msg-systems.com/> http://www.msg-systems.com

 

Sitz der Gesellschaft: Robert-Bürkle-Str. 1, D-85737 Ismaning/München
Vorstand: Hans Zehetmaier (Vorsitzender), Dr. Stephan Frohnhoff, Bernhard
Lang, Roland Roudny, Jens Stäcker, Dr. Dirk Taubner
Aufsichtsratsvorsitzender: Dr. Christian Hofer
Handelsregister: Amtsgericht München, HRB 140 149

Bitte beachten Sie, dass der Inhalt dieser E-Mail vertraulich zu behandeln
ist. Sofern Sie nicht der beabsichtigte Adressat sind, dürfen wir Sie
bitten, uns umgehend zu benachrichtigen und den Inhalt dieser E-Mail zu
löschen.
Please ensure the confidentiality of this e-mail. If you are not the
intended recipient, we would like to ask you to notify us immediately.
Please delete the content of this e-mail in that case

 

1_Merge.png 2a_Commit_Subversive.png 2b_Commit_Tortoise.png
  • application/pkcs7-signature attachment: smime.p7s
Received on 2016-04-22 21:43:43 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.