gregsohl Posted April 11, 2012 Report Share Posted April 11, 2012 I'm simulating the effort a developer would take in a fully distributed model to pull the main branch to their local repository and begin work on a task. There is an aspect of the Branch Explorer presentation in this sequence of steps I find confusing and want to ask about it. Here are my steps: 1. Create a local repository (Name: default) 2. Create a workspace on new local repository (Name: "doddent matter") 3. Set up Sync Replication between local repository (default on GSOHL-DT) and master server repository (default on GSOHL) 4. View pending incoming changes. Pull /main branch from master to local. 5. Open Branch Explorer on workspace "doddent matter". When the new local repository is created in step one, I get an empty root changeset. This is expected. After pulling the /main branch from the remote, I end up with a strange layout in the Branch Explorer, since it is ordered by date only, where that original root changeset now appears on the right side of the graph. It took me a bit to figure out what that empty changeset all the way on the right edge is. Can't tell where its arrow points since it overlaps all the other arrows. I need to basically ignore it, since in a Branch Per Task model I need to create a branch on the last changeset that came from the Master's /main branch. Fine if I choose the branch, not fine if I choose the visibly "most right" changeset, which is really the empty root. How can I make that empty root less of a visual problem? Can't delete it, its the root. Thanks. Greg Link to comment Share on other sites More sharing options...
manu Posted April 11, 2012 Report Share Posted April 11, 2012 Hello Greg, How can I make that empty root less of a visual problem? Can't delete it, its the root. As you said it's only a visual issue, the zero changeset is created by default and it can't be removed. You will forget about it in the next replication. As the zero changeset of the new repository is newer than the replicated changesets it is shown as the newest one, witch is strange since it seems that the replicated changesets are coming from the past.... Don't be afraid of it, it's only a drawing issue. Can't tell where its arrow points since it overlaps all the other arrows. It points to the first changeset replicated. Fine if I choose the branch, not fine if I choose the visibly "most right" changeset, which is really the empty root. Yes, in that case you have to be careful, but as I said you before the next replica operation will add changesets after the zero changeset and you will forget about the drawing problem. Link to comment Share on other sites More sharing options...
gregsohl Posted April 11, 2012 Author Report Share Posted April 11, 2012 Thanks. Just concerned this will be confusing to developers when they are starting (restarting) their local repository fresh. Link to comment Share on other sites More sharing options...
manu Posted April 11, 2012 Report Share Posted April 11, 2012 No problem, I understand that it can be confusing... Link to comment Share on other sites More sharing options...
psantosl Posted April 11, 2012 Report Share Posted April 11, 2012 We will get this FINALLY ironed out soon. It is really a pain. I'll try to push it for this sprint (till 22th), otherwise next. Link to comment Share on other sites More sharing options...
gregsohl Posted April 27, 2012 Author Report Share Posted April 27, 2012 Aarrgg! The house still doesn't move to the newly created and switched to branch in 4.1. Link to comment Share on other sites More sharing options...
carpediemevive Posted April 27, 2012 Report Share Posted April 27, 2012 I too was expecting to see this in this release. It's strange to see it this way. After changing a branch the branch explorer doesn't visually change at all, yet I feel like it should. One thing that was included in 4.1 is the inclusion of, what I've termed, the "head" icon. It shows up at some points when I have pending changes. If this was always visible it would probably help a lot. Then it becomes consistent. The house icon always shows where you came from, and the head icon always shows where these changes are going to go. I really think this is all because of a disconnect between what the icon means to the Plastic developers, and what we visually want it to mean as developers. I care so much more about where my changes are going to go than where this branch came from. Link to comment Share on other sites More sharing options...
manu Posted May 2, 2012 Report Share Posted May 2, 2012 Aarrgg! The house still doesn't move to the newly created and switched to branch in 4.1. Please add more info of this one :S Link to comment Share on other sites More sharing options...
carpediemevive Posted May 2, 2012 Report Share Posted May 2, 2012 I can't speak for Greg, but I'll do my best to clarify my confusion. In the Branch Explorer, right-click on a Label and select "Create branch from this label..." Give it any old name and comment Select the "Switch workspace to this branch" checkbox. Hit "OK" In your branch explorer you now see the new branch. If you look up at your selector information in the GUI at the top left you'll see "Branch /main/TestingBranch" (or whatever name you typed). In your branch explorer though, the house icon is still inside the changeset that you branched from. The house icon makes me thing "This is where I am right now". As an implementation detail, this is in fact the case because you haven't made any changesets inside the new branch. However, as a developer I'm not concerned with that implementation detail and when I say "This is where I am right now" what I'm really saying is "This is where the changes I make are going to go". The house icon staying on the main branch makes me think when I commit that I'm going to be committing to main. With the 4.1 release I'm seeing a new icon that represents pending changes. This little icon appears very infrequently, but it's probably the most useful piece in addressing this issue. This icon represents exactly what a developer wants to know: "This is where the changes I make are going to go". I don't know if I'm technically wrong, but I think of it as something very similar to what HEAD represents in Git. I would want this icon to always be shown, similar to how the house icon is currently always shown. The expected behavior would then be: In the Branch Explorer, right-click on a Label and select "Create branch from this label..." Give it any old name and comment Select the "Switch workspace to this branch" checkbox. Hit "OK" Notice "house" icon in the main branch still Notice the "pending changes" icon in the newly created and now my current branch. Prior to the new branch being created I would expect a "pending changes" icon to be displayed next to the latest changeset in whatever branch I'm currently in. Link to comment Share on other sites More sharing options...
gregsohl Posted May 2, 2012 Author Report Share Posted May 2, 2012 carpediemevive explained it as I would have. Thanks! The fault is mine for the confusion. I posted this note back on the wrong thread. I had another where I had originally posted related screen shots for the "house" position. Link to comment Share on other sites More sharing options...
gregsohl Posted May 2, 2012 Author Report Share Posted May 2, 2012 It was here: Manuel's last reply was "its planned - keep tuned for the next release". 4.1 didn't have it. Hoping for the "next" release! Link to comment Share on other sites More sharing options...
manu Posted May 2, 2012 Report Share Posted May 2, 2012 Thanks carpediemevive! Yep, I was thinking of the "Pending changes changeset" while writing the post. But as you know the "Pending changes changeset" is only shown when you actually have changes... Greg, for you which one would be the best approach when you switch to an empty branch? Link to comment Share on other sites More sharing options...
gregsohl Posted May 2, 2012 Author Report Share Posted May 2, 2012 I believe the house should be in sync with your workspace. So when switching to an empty branch, the house should move to that empty branch. The line / arrow drawn from that empty branch to its source changeset is all that is needed to know ancestry. Greg Link to comment Share on other sites More sharing options...
manu Posted May 2, 2012 Report Share Posted May 2, 2012 But the house needs a changeset to be placed and drawing a fake changeset can be also confusing... Link to comment Share on other sites More sharing options...
gregsohl Posted May 2, 2012 Author Report Share Posted May 2, 2012 What carpediemevive and I are saying is that we don't look at the house based on your internal implementation details that tie it to a changeset. Visually, to us, it should represent what branch and my workspace is on and if there are changesets in the branch, what changeset the workspace is on. It sounds like your implementation makes that hard. But perhaps it is the implementation that is incorrect. You know where my workspace is pointed. The selector names it. CM WI shows it. We just want the house to show it too. Otherwise it appears that a commit/checkin will be going to the wrong place. Link to comment Share on other sites More sharing options...
manu Posted May 2, 2012 Report Share Posted May 2, 2012 I understand. I'll propose to change the behavior in the next meeting! Link to comment Share on other sites More sharing options...
hampsterx Posted May 8, 2012 Report Share Posted May 8, 2012 hey thats what you said before! http://www.plasticscm.net/index.php?/topic/685-minor-ui-twig-home-icon-on-new-branch/ Link to comment Share on other sites More sharing options...
manu Posted May 9, 2012 Report Share Posted May 9, 2012 yes yes yes! hehehe It's implemented and it will be included in the next release! I promise! Link to comment Share on other sites More sharing options...
gregsohl Posted June 6, 2012 Author Report Share Posted June 6, 2012 To wrap up this topic, since I got it off its original topic earlier, the house now goes to the right branch, even with no changeset in it, in release 4.1.10.290. Thanks! Link to comment Share on other sites More sharing options...
manu Posted June 7, 2012 Report Share Posted June 7, 2012 You are welcome Greg! I love the new house icon behavior! Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.