Improve XLink conflict resolving in merge
Imagine the following scenario:
A repo with a XLink with a main branch and a child branch. Both branches have the same XLink.
Now the following occurs:
1) XLink is changed in both main branch and child branch
2) You do a merge from main to child branch
You'll get a conflict (which is expected). However, the "Source" and "Destination" values aren't very human readable in the GUI. I'm assuming they're the GUID's of the changeset or something similar.
Could you make it more human readable? Displaying the associated changeset, branch etc?
We would need an answer to the question we asked here to be able to move forward. Otherwise, without extra info, we would need to discard.
Maurizio Margiotta commented
The changeset id and name are for sure welcome, but I would also add that I got a conflict showing the exact same GUIDs as both branches that were merging had an xlink updated to the same changeset. So under the subject of "improving xlink conflic resolving", I'd say that this situation could also be automated.
Todd Alden commented
I don't know if it is the OP situation, but I know one use case that can be confusing...
If you have a writable xlink that is not on the head of a branch and then you either checkin or merge (with changes done to the files in the wxlink) it can be a little confusing as to what is actually needing to occur, where the checkin/merges will occur, etc. Expand the use case to 100 wxlinks and it can get really interesting.
"Make sure to handle the new support for "partial readonly xlinks" well (indicate targeted sub-directory)"
Göran Wallgren commented
Make sure to handle the new support for "partial readonly xlinks" well (indicate targeted sub-directory).
For both src and dst, show the target sub-dir, changeset, (branch), repo, (server).
Hi James (& supporters),
Yes, we show the changeset GUID which tends to be the most used identifier once you use Plastic in DVCS mode.
That being said, we can certainly add the csetid and the branch name too. Is that all you need to get a better usability?? Please let us know.