Soho Posted September 28, 2012 Report Share Posted September 28, 2012 Hi, We often bump into a still unresolved problem with wxlinks. Here is the latest issue: In a /main/somebranch I created an wxlink to a common library shared among many projects. Before /main/somebranch was finished and ready to be merged with /main, the commons library had some changes, so /main/somebranch did not point to the newest changeset when I tried to merge it with main. After merging I ended up in the often seen deadlock where Plastic refuses to checkin and undo pending changes because it claims that there are changeset does not include all merge links. All merge links and changes were marked as included, but I did notice that the commons library appeared twice in the merge link list with two different changesets (it is only linked once). The only thing I could do to make it work again was to delete the whole workspace and recreate it. After this I updated the xlink in /main/somebranch to latest changeset of the commons library and repeated the merge, which executed without problems. Link to comment Share on other sites More sharing options...
manu Posted September 28, 2012 Report Share Posted September 28, 2012 Hi Soho, I've just tested the scenario with the latest public release (4.1.10.345) and it works fine. I can remember that a case like this case was fixed recently. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.