Did you "Deliver" the change (from the Pending Changes tab) to your stream? Until you do that Deliver from machine 1 - you should not see your changes appear on the other machine's repository workspace as Incoming changes

Yes I did. And if I browse the repository workspace and show history, it shows up in the history.

Another point of interest -- the "loaded workspace" in the Team Artifacts view shows "(1 - Initial Baseline)" next to it. Does that mean my local workspace is currently "locked" on the initial version of the stream? Not sure how to read that...

Thanks,
Mike

OK - so you checked-in and delivered (or you have check-in set to run automatically when you save and you just delivered).

When you delivered, were the changes in the Outgoing section of the Pending Changes, or somewhere else.

I checked in and delivered. The changes showed up in the "Outgoing" section.

Did you create any components or other baselines and snapshots - or just accept the defaults?

I created two components. I believe I renamed both of them; I think one of them is called "Mike's First Component" and the other one is called "Comp2" :D

Maybe my next interesting discovery from this morning will either help or confuse the issue more.

1. On "machine A" I created a baseline in my "Comp2".
2. On "machine A" I then delivered the baseline (it showed up in the Pending Changes view).
3. On "machine A", in my Team Artifacts view->My Repository Workspaces->My Repository Workspace->Comp2, I select "Show Baselines".
4. The list shows "Baselines for Comp2 component in Mike's Repository Workspace". The top one is the baseline I just created.
5. Next I select the dropdown and change to show "Baselines for Comp2 component in Mike's Team Stream". The list shows just 2 baselines (the one I just created and the initial baseline).

6. Next I go back to "machine B".
7. On "machine B" under the repository workspace, I right-click Comp2 and select "Show Baselines". It shows me 3 baselines -- 1 - Initial Baseline, 3 - Backup Before Replace, and then 1-Initial Baseline again. Nothing about the baseline I just created.
8. On "machine B" I select the dropdown and change to show "Baselines for Comp2 component in Mike's Team Stream." The list shows the 2 baselines shown in step 5 above (the one I just created and the initial baseline).
9. I right-click the baseline I just created and select "Compare with Local Workspace". The Changes view is empty; this I did not expect, since the changes we've been talking about should be in the latest baseline. (I added some files, deleted a file, modified 2 files...) This would not be expected because I can see in my local Eclipse workspace that the new files are not there, the modified files have not been modified, and the deleted file is still there. I am thinking that if I can ever get my changesets to show up in the "Incoming" list and apply those, then all those changes will get applied.
10. Also, the other weird thing is that the drop down for picking what is shown in the History view is very different between the two machines. On machine A I have several items; the 2 baseline menu items mentioned above, plus menu items to show the history of the stream and the history of the workspace. On machine B I only have the 2 baseline menu items.

Sorry for all the wordiness... I know there must just be something dumb I am not seeing!!

Thanks,
Mike Johnson

OK, I think my problems are solved. I apparently was using the *same* workspace on both machines, and maybe that was hosing stuff up? I created a new workspace on machine B, and now I can flow changes back and forth between both machines by using the workspaces to deliver to the stream, and then accepting incoming changes from the stream.

I *knew* I would get this eventually!!! I think it's just the changing of the SCM terms that was messing me up -- I'm used to the Subversion world, so it takes some adjustment. :wink:

Thanks,
Mike