Amimoller Posted September 23, 2014 Report Share Posted September 23, 2014 Hi, After updating to one of the latest releases (5.0.44.603) it seems like the "View new changes" button in the pending changes tab will always result in a merge even if we have nothing checked out locally. We use this very often to keep up to date without having to do a checkin, but now its no longer possible. This must be a bug? I have attached a couple of screens that shows first no local changes and then after i hit View New Changes. Cheers Jonas Link to comment Share on other sites More sharing options...
Amimoller Posted September 23, 2014 Author Report Share Posted September 23, 2014 Actually this seems like a general problem, when we checkin we are not allowed to just update without merging if there are no conflicts. Link to comment Share on other sites More sharing options...
calbzam Posted September 23, 2014 Report Share Posted September 23, 2014 Hi, It´s a bit strange. I´ve performed a test and not able to reproduce the issue. - Are you able to reproduce the issue using two workspaces pointing to the same repository? - Is the selector pointing to the same branch in both workspaces? - Do you have checked-out files? - Do you have Xlinks? Regards, Carlos Link to comment Share on other sites More sharing options...
Amimoller Posted September 24, 2014 Author Report Share Posted September 24, 2014 It happens in all the three workspaces i tried. I also tried switching to other branches and further back but the result is always the same. In all cases i had no checked out files. But it did work normally in another repository from one of our other projects. We do have several writetable xlinks in this repo, the other functional repo only has 1 xlink. Link to comment Share on other sites More sharing options...
calbzam Posted September 24, 2014 Report Share Posted September 24, 2014 Hi, I´ve tested will XLinks but no luck If you create a new workspace, the behavior persists? Are you sure that the Xlink is pointing to the last changeset of the branch and the merge is not performed to solve conflicts in the Xlinked repo and not in the parent repo? Regards, Carlos Link to comment Share on other sites More sharing options...
Amimoller Posted September 24, 2014 Author Report Share Posted September 24, 2014 Tried with a fresh workspace, same thing. There don't appear to be any merges regarding files that are xlinked. (We only have a handfull of files from xlinked folders) I think the bug appeared somewhere between 534 and 603 since the old version of plastic still works fine. Cheers Jonas Link to comment Share on other sites More sharing options...
Amimoller Posted September 26, 2014 Author Report Share Posted September 26, 2014 Do you need more info on this bug? I could send logs except i never got it working with the example log config thats around here somewhere. Cheers Link to comment Share on other sites More sharing options...
Amimoller Posted October 2, 2014 Author Report Share Posted October 2, 2014 This issue is still preventing us from using any of the newer builds. Link to comment Share on other sites More sharing options...
calbzam Posted October 3, 2014 Report Share Posted October 3, 2014 Hi, I would like to get connected to review your scenario because I cannot reproduce the issue in my local environment using the last 5.0 or 5.4. You can reach me at: calba at codicesoftware dot com Regards, Carlos Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.