Weird behaviour when committing merge from trunk to branch on SVN (and diffing the commit)
We use SVN. I merged changes from trunk into a checked-out branch (using the Version Control panel > Subversion Working Copies Information > Merge From... > trunk > Quick Manual Select).
I got a merge conflict, which I manually resolved.
Right after that, a Commit message popped up.
I committed.
The "success" message afterwards was talking about 4 files, when I had only selected one. That set the alarm bells off.
So, afterwards, I right-clicked on my project root, and in the context menu, selected Subversion > Show History.
I refreshed the list, selected my commit, and Compare from the context menu (cmd + D).
And then I got this screen. Can anyone tell me what happened, what these dots are doing in that message, and if I need to revert my commit or if I'm fine, please?
Thanks,
Christian
请先登录再写评论。
These double dots actually mean the parent folder. So it looks like the path is just show relatively to the root, in a weird way. Probably this is because the directories web and src are also considered committed objects.
Does not look totally wrong in general.
Is it shown the same way in the commit details pane of the Repository tab?
Are all the files correctly show if you use SVN Repo Browser (VCS - Browse VCS Repository - Browse Subversion Repository)?
Well, if two dots really mean one level up (as they usually do), doesn't that take us up even further than the http://svn.example.com/ ?
It looks all right-ish in the Repo tab, and I accessed the SVN repo via web browser, and the change made it into the right file. Nevertheless, I am slightly worried about IntelliJ's insistence it changed 1 file and 3 folders... - even on the repo tab...
The path takes us exactly to the root - 9 steps above starting from the main directory. From there you go to svn.exmple.com/svn/ and so on. Basically, that entire construction should be just main, Not sure why it is displayed this way.
Basically, that entire construction should be just main, Not sure why it is displayed this way, could not reproduce it with a simple test.
As for the directories change, there could be differences in SVN properties of the folders. What does diff say if opened for the specific folder?