Hello
I'm getting some very strange behavior from subversion. One of the biggest issues is why does it not ignore files I tell it to ignore? Can someone tell me how to get it to ignore files and directories properly? Following the documentation does not work. I have the following setup:
Coins
Coins/Cents
Coins/Nickels
Coins/Dimes
Coins/Quarters
And on each of those directories I have the following value for the svn:ignore property (results of svn propget svn:ignore:)
*.suo
*.user
obj
bin
I have created a branch called LGcents. I try to merge back into trunk and this is what I get:
--- Merging r14 through r50 into '.':
G Dimes\Dimes.suo
Skipped 'Dimes\obj'
Skipped 'Coins.suo'
Skipped 'bin'
Skipped missing target: 'Dimes\bin'
Skipped 'obj'
G Dimes
C Build.bat
Skipped missing target: 'Quarters\bin'
Skipped 'Quarters\obj'
Skipped 'Quarters\Quarters.suo'
G Quarters
U Nickels\Nickels.Designer.vb
Skipped missing target: 'Nickels\bin'
Skipped 'Nickels\obj'
Skipped 'Nickels\Nickels.suo'
G Nickels
C Cents\Cents.suo
Skipped missing target: 'Cents\bin'
Skipped 'Cents\obj'
G Cents
G .
--- Recording mergeinfo for merge of r14 through r50 into '.':
U .
Summary of conflicts:
Tree conflicts: 2
Skipped paths: 13
And svn status returns this:
C Build.bat
> local add, incoming add upon merge
M Cents\Censt.Designer.vb
M Cents\Censt.vb
D C Cents\Cents.suo
> local delete, incoming delete upon merge
! C Cents\bin
> local delete, incoming delete upon merge
M Dimes\Dimes.Designer.vb
M Dimes\Dimes.suo
M Dimes\Dimes.vb
! C Dimes\bin
> local delete, incoming delete upon merge
! C Nickels\bin
> local delete, incoming delete upon merge
M Quarters\Quarters.Designer.vb
M Quarters\Quarters.vb
! C Quarters\bin
> local delete, incoming delete upon merge
Summary of conflicts:
Tree conflicts: 6
Why does merge report 2 conflicts and status report 6? That is very confusing.
Why is build.bat causing a local add and incoming add? That file has been added many revisions ago.
Why is Cents.suo causing a local delete. That file was not deleted either. Nor were any of the other conflicts.
Both the trunk and branch were committed and updated in that order. Then I switch the directory between the branch and trunk since it is set up with the auxillery files needed to run the project.
The first merge I tried failed and after that I issued the ignore commands and also issued the resolve command a lot.
Is subversion extremely fragile? Is there a way to fix it? Is there any more complete documentation? The book is incomplete.
Thanks
JM
Received on 2013-08-09 19:28:51 CEST