I worked on a small project a while ago using Rational Team Concert eclipse. I got rid of it when I was finished the project.
I remember we could go to the team view and open the browser to view our team tasks and user stories and files. I have been googling around for that login page so I can see my old project files again but haven't had any luck.
Does anyone know where I can access my old project files stored on the source control server?
There are 3(!) "Team" view in an RTC client:
Team artifacts (with the Work Items, Build and Source Control sections for each Project Area)
Team Organization (with all the members)
Team Dashboard (with your work items, the event logs and Team Load)
I suspect you need to go to the Team Artifact view, get back your project area and check if you still have your repository workspace there for a given Stream.
If yes, you need to load it again to your disk, creating a local workspace or sandbox, in order to get back your Eclipse project.
If not, create a repo workspace on the right Stream and load it.
See "Flow changes cross repositories with Rational Team Concert" for more on that sequence of operations.
Related
As a new Egit user, aiming to set up version control to update the way a team manages source code without changing locations of our build and dev servers and to identify correct Egit commands to use for check in and check out code from both servers.
In a single Eclipse workspace, initially had one project without use of Egit just a basic automatic and adhoc file copy back up of changed development directory into folders with dates of backup. Promotion to the build server was done by manually copying source files and binaries, doing a diff between source on the MainServer and local server to manage any merges. Now need to implement a proper version control system, using Egit, so as a first time Egit user. I have set up two test Eclipse projects in my workspace: project A shared with MainServerRepository and project B shared with LocalServerRepo. The two git repositories will be in different directories: MainServerRepository on the network and LocalServerRepo on my area on the network where I backup my PC.
What Egit actions do I take to promote latest TESTGIT1.src from MainServerRepository into LocalServerRepo to work on in my local server? (Team > Fetch from upstream is grayed out). Then, once tested, how do I check in src for TESTGIT1 into the main build server project, source and objects are in MainServerRepository?
I've used Team > Commit successfully to check in, but am using cut and paste to move code between two projects (prior to commit) and feel there must be a better way to do this or to set up the projects differently within Eclipse.
Or should I be using Team > push or Team > merge?
Do I need local repository or should I just check out into workspace?
Any comments/ question/assistance would be welcome as haven't figured it out from reading the EGit/User_Guide.
Edit TESTGIT1.src in Eclipse project shared with LocalServerRepo(testGitRepo) until work on it is complete on local server. Then, apply same changes to TESTGIT1 in the main build server project, using right click copy +paste from right click, team > check in. Then in Git Staging view, click plus sign to add to index (staging area), then click commit button, merging in with any other changes made to TESTGIT1.src by other developers. Don't use push command to push entire contents of LocalServerRepo. Or is there a better answer?
I am using Eclipse Version: Neon.3 Release (4.6.3), and have installed TFS plugin in it.
When I am making any changes to the code, the changed files not show up in Included Changes in TFVC Pending Changes Tab, all the changed files show up there only after restart of the eclipse or manually clicking on Action -> Detect Local Changes.
Anybody have solution to this problem, so that I dont have to restart eclipse or or manually clicking on Action -> Detect Local Changes and it detects it automatically.
First, please double check whether you are using server workspaces or local workspaces.
In a server workspace, TFS requires that you inform the server for every change - to check out a file, rename, delete, etc. This
allows TFS to avoid scanning your disk for changes, which is
beneficial for large repositories. If you want to force a disk
scan with Team Explorer Everywhere, because you may have made some
changes outside of Eclipse, you can go to the Actions menu and
select Detect Local Changes.
In a local workspace, TFS will examine your disk for changes every time you look at the pending change status. So all you have
to do is run tf status or click refresh in the Pending Changes
View to see changes made to files outside of Eclipse.
According to your description, seems you are using serverworkspaces. If so suggest you switch to a Local workspace, in which case TFS will store a copy of your file in a hidden folder, so that it always knows what your workspace version looked like when TFS served it to you.
As how to judge you are working on server workspace or local workspace and edit workspaces, follow below steps:
In Project Explorer or Package Explorer, right-click an
Eclipse project that is under version control, point to Team,
and click Manage Workspaces.
The Workspaces dialog box appears. It shows you the list of your Team Foundation Server workspaces.
Then select the one you want to convert, click Edit; the Edit Workspace dialog box appears just as
below screenshot:
Note: Local workspaces are only supported for Team Foundation Server 2012 and above.
My colleague and I work together on an iPhone app in Xcode. Now and then, we want to merge our work. Ideally, this should also work when we are offline and use a USB stick to exchange eachother's projects.
For the case the majority of the changes are non-conflicting, what way can I use to merge these two whole projects locally, and keeping the local GIT repository in sync with these merges?
To merge the changes into your version, you need to add your colleague's version as a remote repository (although stored locally on harddisk) to your project and then pull the changes from your colleague's project into your own project.
Details:
I'm assuming you have two copies of the same Xcode project, with different changes, on your local harddisk, yours and the one with the additional changes from your colleague that you want to merge into your own version.
Moreover, I'm assuming that both of you use a local GIT repository for local version control. That's the default when you start a new Xcode project, so unsually you don't need to worry about this.
Let's assume the project folders are in these locations:
/Users/UserName/projects/YourVersion
/Users/UserName/projects/YourColleaguesVersion
For adding your colleagues project as a remote repository to your project, do this:
Go to the Organizer (click in Xcode's Menu: Window > Organizer)
Click on Repositories at the top of the Organizer window
Locate YourVersion in the list at the left side of the Organizer window
Click on "Remotes" under YourVersion
Click on "Add Remote" at the bottom of the Organizer window
In the Dialog which appeared, type in this:
Remote Name: YourColleaguesVersion
Location: file:///Users/UserName/projects/YourColleaguesVersion
Click the "Create" button and close the Organizer window
Now for pulling the changes from your colleage's project into your project, do this:
Click in Xcode's Menu: File > Source Control > Pull...
A Dialog opens and says "Choose remote from which to pull changes." - It should show YourColleaguesVersion/master as the remote repository and it should say Remote is online. Click on the "Choose" button.
You're done.
This is what source control is for. You mention git, and that's a reasonable source control system to use. git is very good at branching and merging and makes it pretty easy. You should read the git book chapter on branching. It explains it pretty well.
There are a variety of ways you can do it, but if you both work on different computers, it seems like the easiest way is to have a git server that hosts the main repository. You can each branch and merge locally or from the server. You shouldn't need to share a memory stick, though you could theoretically keep a local git repository there and each have branches on it. But git was intended to be used by many people distributed in different places each making their own frequent branches and merging them back together.
I should add that you can start a git repository locally and later move it to a server if you don't have a server right now. You can also use something like github to store your project on a server without having your own server.
I erroneously shared a locally developed project into trunk. I deleted it in Eclipse SVN Repository Exploring view. It no longer appears in the repository view. Then I tried to share the project into the correct branch and I get this message:
The project "Project1" already exists in repository and has some
content. To connect the local project to the specified location, the
repository folder content should be checked out. Please consider that
applying local changes can cause resource conflicts. For example, if
the local file has the same name as the remote directory the working
copy of the file will be obstructed.
Do you wish to proceed ?
There is no project with that name in SVN that I can see.
After trying unsuccessfully to find any references to this message I chose yes for proceed. Then it looked like it was uploading multiple projects and files that didn't belong to this project -- the title on the dialog box was Share Projects rather than Share Project as well -- so I pressed cancel.
Anybody know what is happening here?
Recently I tried out the new TFS-Service, and really liked the built in Scrum template for project management, and the new ability to create a team project managed with Git.
It would seem that the Git integration is only possible when using Visual Studio on windows though. Using Eclipse (with the Team Explorer plugin) I was unable to work with a git-based team project.
Is this really the case?
Heres what I've tried:
In TFS Service, I have a git-based team project with some commits in it.
In Eclipse, I connected to the team project, but it seems I can't pull or even see the source in any way. Source control explorer doesn't show any code (or any paths even).
In TFS, I created a new git-based team project. In Eclipse I created a new project and used Team -> Share... to try and get the code into TFS. But selecting TFS there doesn't seem to have the disired effect: it doesn't understand that it's a git-based team project, and so it doesn't try to push the code with git, but upload it to a new path ($/some/path/here/).
So is that it, or perhaps there's a workaround? Maybe I did something wrong?
BTW - I know about using TFS with git-tf, and I'm OK with that option, but it's not what I'm asking.
Thanks.
We're working on improving this for the next major version of Team Explorer Everywhere (TEE), but this is what you'll want to do today.
Eclipse already has a full featured Git version control provider in the eGit plugin. This is installed in many versions of Eclipse but if you do not have it you can install it from here:
http://marketplace.eclipse.org/node/1336
To use eGit today against the hosted service you must enable alternate credentials in TFS (click on your name in the top right corner, My Profile, Credentials then enable and configure your credentials).
Once this is enabled you can point eGit at your service account repo and you are good to go. In the Import or Share wizards pick Git and then follow through th eGit dialogs.
When you make a commit, if you add #123 into the work item comment it will associate the commit with that work item number when you push it to the server.
Now, I mentioned that we are trying to make this better. What we are aiming to do is show you both your TFVC and your Git related projects when you import and share and if you have picked a Git repo then we'll help you get your credentials set up, clone it and get the version control parts of Eclipse hooked up to eGit (assuming you have eGit installed). We'll also make sure that the other Team Explorer Views (such as work items, builds etc) all work great and that links to Git commits etc do the right thing. Hope that makes sense - but if anyone wants to talk more about how Git projects will work in future versions of Team Explorer Everywhere then feel free to drop me a mail (martinwo#microsoft.com)