zechman

Is there any way to remove items from the change set list when you are merging, and select the 'selected changesets' radio button We have had some scenarios where someone had to check out files from a branch and make the change manualy, instead of doing a merge. So now when you go to select your changeset to merge there are items changesets listed that never got merged, but the code is in the other branch. So is there a way to flag these as merged, or something so they don't show up in the list

Re: Team Foundation Server - Version Control TFS Unmerged change sets

eugene.z

Hello,

You will probably want to use tf.exe merge command discard switch. See the following thread for details.

Regards, Eugene






Re: Team Foundation Server - Version Control TFS Unmerged change sets

zechman

I tried a few different ways and it didn't work.

First i tried : tf merge /discard /version:C561 "$GAINWeb PL\DEV" "$GAINWeb PL\MDL"

i got an error saying that the path had a $ in it and try to remove it and try again

Then i tried the local path: tf merge /discard /version:C561 C:\TFS\GAINWeb\DEV C:\TFS\GAINWeb\MDL and it said there are no changes to merge





Re: Team Foundation Server - Version Control TFS Unmerged change sets

eugene.z

Hello,

I think you should try it like that

tf merge /discard /version:C561~C561 "$/GAINWeb PL\DEV" "$/GAINWeb PL\MDL"

And if you are merging folders, recursive flag would not go amiss as well. See the following thread for details.

Regards, Eugene






Re: Team Foundation Server - Version Control TFS Unmerged change sets

Richard Berg MSFT

First i tried : tf merge /discard /version:C561 "$GAINWeb PL\DEV" "$GAINWeb PL\MDL"

i got an error saying that the path had a $ in it and try to remove it and try again

You're missing a "/". The root of the repository is "$/", so team projects have the form "$/GAINWeb PL"; all server paths start the same way. As a result, your syntax is being parsed as a local file named ".\$GAINWeb PL\DEV". Files are not allowed to begin with a "$."





Re: Team Foundation Server - Version Control TFS Unmerged change sets

zechman

now i get unable to determine workspace. Do i have to be on the server As a side not i also tried using C# and the .net classes and it didn't work either.



Re: Team Foundation Server - Version Control TFS Unmerged change sets

eugene.z

Do you have both of your server folders mapped And if yes, do you have them mapped in single workspace Beacuse if there are two mapping of same folder in different workspaces, tf.exe will be unable to determine what workspace to use.

Regards, Eugene






Re: Team Foundation Server - Version Control TFS Unmerged change sets

zechman

I have 1 workspace for everything, and 2 different folders 1 dev and 1 test.



Re: Team Foundation Server - Version Control TFS Unmerged change sets

zechman

I navigated to the folder with the source file was and ran the exe and got a message that said "there are no changes to merge" and the CS still shows up in the merge list.



Re: Team Foundation Server - Version Control TFS Unmerged change sets

zechman

I added the recursive flag and got a message saying that it merged the test version as AcceptYours, but when i go and look a the merge list in the dev branch the change set still shows up in the list.



Re: Team Foundation Server - Version Control TFS Unmerged change sets

eugene.z

Can you post the command line that you are running And what changeset appears in merge candidates list in UI

Regards, Eugene






Re: Team Foundation Server - Version Control TFS Unmerged change sets

Richard Berg MSFT

After you ran the merge /discard, did you checkin




Re: Team Foundation Server - Version Control TFS Unmerged change sets

zechman

I didn't at the time. but i now realize that i have to add a check in step to check in the merged file with no changes.