Confusion when the Merge target solution is not loaded

Merging when the source branch solution is loaded into VS and the target branch isn't throws you off for a moment because you know there should be pending changes but there aren't any.  At least not until you load the target branch solution.  This is a rough-edge IMO. 

What if I merge branches and the merge spans multiple solutions   Do I need to load each solution in order to checkin all the pending changes from within VS   I know there's probably an easier way to do this from the command line but folks are probably going to prefer to stay in VS when possible.



Answer this question

Confusion when the Merge target solution is not loaded

  • jasonweiyi

    Do you have more than one workspace   The pending checkin window and the source control explorer were most likely using different workspaces when you see the pending checkins window empty and yet you are working with pending changes in the source control explorer.

    As Ben mentioned, we're working on improving how the pending checkin window, source control explorer, and solution explorer handle multiple workspaces.

    Buck

  • AidanKP

    That does sound problematic, yes!  It's a ramification of one of my fears about TFS: dependency on Visual Studio for it's only GUI.  If I was using Vault, for example, VS would behave the same - since it only shows objects that are part of the open solution, but I could just fire up the stand-alone Vault client which would show all pending changes regardless of solution (in reality, that's how I always work anyway - the pending checkins feature in VS is too painful to use in comparison).

  • alwo

    Here's my vote for a combo-box in the pending checkins window Smile

  • tanya111

    For doing source control operations that should not be scoped to a solution, you should use the Source Control Explorer (aka Version Control Explorer).  For the case of the branch, you can right click a folder node that parents (either directly or indirectly) the target branch and select "Check In".  The check in dialog that appears should have all of the pending branches listed regardless of whether there is an open solution.

    --Ben

  • Aeraf

    The Pending Checkins tool window is supposed to show you all pending changes for the current workspace (i.e. it is not scoped to just changes for the solution).  HOWEVER, the workspace the Pending Checkins window is associated with can differ from the current workspace the Source Control Explorer is using.

    The workspace for the Pending Checkins window should be the workspace that contains the currently opened solution (or the last controlled solution that was open).  The workspace for the Source Control Explorer is switchable via the Workspace combo box located in that toolwindow and does NOT affect the workspace selection for the Pending Checkins toolwindow.

    I can't remember if it made it into the Beta, but the Pending Checkins tool window title bar now includes the name of the workspace it is associated with.  This can alleviate some confusion.

    There have been discussions about allowing the Pending Checkins tool window workspace to track the Source Control Explorer workspace if there is not a solution open.  We've also discussed providing a Workspace combobox in the Pending Checkins window to permit switching the associated workspace just as we do with the Source Control Explorer.

    --Ben

  • bub

    The Pending Checkins tool window is supposed to show you all pending changes for the current workspace (i.e. it is not scoped to just changes for the solution).  HOWEVER, the workspace the Pending Checkins window is associated with can differ from the current workspace the Source Control Explorer is using.

    That isn't the behavior I observed. The branch target directory was in my same workspace yet my Pending Checkins tool window was empty.  Perhaps a bug with updating the Pending Checkins tool window

  • IbeMale

    That's good to know.  I still wish for a way to switch the "Pending checkins" tool window between "Solution" mode and entire workspace mode.  I found this in other ways.  I have looked at the Source Control Explorer and have had to bounce around the directories to see what files I had checked out in various different solutions. I was really yearning for a UI that would display all of that information in one place.  Perhaps "Pending Checkins" isn't the right place.  If so, then there should be another view of some sort, preferably modeless tool window, that will show me everything I have checked out in my entire workspace.
  • Confusion when the Merge target solution is not loaded