David R Posted February 1, 2017 Report Share Posted February 1, 2017 Other people on the team used the new 'merge changeset to' feature to move a main branch changeset to a new branch. Now in Branch Explorer the main branch and the new branch overlap so they cannot be moved using relayout mode. You can just about see overlapping labels and when you right click it shows the two changesets. Apologies if my terms are incorrect as I am a new Plastic SCM user. 5.4.16.802 on Windows 7 and Windows 10. How do we separate the changesets? TIA David Link to comment Share on other sites More sharing options...
David R Posted February 1, 2017 Author Report Share Posted February 1, 2017 Update. I added a change to extend the branch so it could be selected and moved. The main line branch is still attached to the other branch and moves with it. See the fainter label under the selected branch/changeset. I would caution people using the the feature which I believe is Advanced, "Move changeset to a different branch". Apologies if we have used this incorrectly. TIA David Link to comment Share on other sites More sharing options...
manu Posted February 1, 2017 Report Share Posted February 1, 2017 Hi! I'm a little confused. 1 hour ago, David R said: Now in Branch Explorer the main branch and the new branch overlap 1 hour ago, David R said: You can just about see overlapping labels So you have both the branches and the label overlapped? I can see how you cset is having two label applied, that can happen, it's not a problem, in fact, you can have as many labels as you want applied for the same changeset. 1 hour ago, David R said: The main line branch is still attached to the other branch and moves with it. See the fainter label under the selected branch/changeset. I'm sorry but I'm not sure if I understand what do you mean, I see the changeset with the two labels, that changeset is the fist changeset on the "/master/20012 DWM" branch, and that branch is child of "/master" but I can't see master in your screenshots, I guess it's out of frame and not overlapped with its child, right? Link to comment Share on other sites More sharing options...
David R Posted February 1, 2017 Author Report Share Posted February 1, 2017 Hi manu, Thank you for replying so promptly. Yes, the master was out of frame. I've attached a larger annotated screenshot *3.png. David Link to comment Share on other sites More sharing options...
manu Posted February 1, 2017 Report Share Posted February 1, 2017 Hi David, but "Build_Nighly_88" is not a branch, not even a changeset, it's a label. That label changeset is sharing the changeset with another label that is called "Build_Checkin_245". Both labels are labeling the changeset you moved from "/master" to "/master/20012 DWM". Link to comment Share on other sites More sharing options...
David R Posted February 1, 2017 Author Report Share Posted February 1, 2017 Hi manu, Thank you for your comments. I see what you mean about labels. A bit of user education here We will talk to our Continuous Integration colleague. It is that process that does the 'Build_...' It seems to have followed this branch instead of stopping at the main. So more work to be done here that may take awhile due to obtaining staff time and one being off sick. It will also be interesting to see what happens when another change is added to the master branch. Will be in touch. David Link to comment Share on other sites More sharing options...
David R Posted February 3, 2017 Author Report Share Posted February 3, 2017 Hi All, Just to close out this query. It was us mis-understanding of what was being shown in Branch Explorer. We do not have 100% confidence in it sometimes due to the inability to select and move things sometimes. In this case labels had been applied by our Build Server which looked to us like a changeset. We also thought the Build Server had followed a branch instead of the main branch. In fact when we moved changesets, probably the labels had already been applied. Thank you to manu for help us understand the situation. Best regards to all, David Link to comment Share on other sites More sharing options...
manu Posted February 6, 2017 Report Share Posted February 6, 2017 Ok David, no problem at all! If you need help or a small training don't hesitate to contact us. Best, Manu. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.