Skip to content

Conversation

@RubenWillems
Copy link
Contributor

A new section (view) has been foreseen : TeamChanges
Purpose : merge all not yet merged changesets from one branch to it's parent or child branches (GetMergeCandidates)
like the original merge in TFS itself, but with the bonus of linking all workitems.

First you choose the TFS project
Next your source branch, and the target branch.
Next fetch the changesets
Choose which to merge
Press the merge button

The original RecentChangeset functionality is still there,
so one can choose which option to use for merging.

Big overview of the changes :
Renamed folder RecentChangesets to Changesets
Added folder 'Changesets\Providers' and moved all the providers in it
Added folder 'Changesets\Solo' and moved the existing RecentChangesets view in it
Added folder 'Changesets\Team' and added the team view in it
Renamed a few classes from RecentX to X, because they are used in both views and do not have any
functionality related to the 'recentChangeset' itself

IChangesetProvider : Task<List> GetChangesets(string userLogin);
changed to Task<List> GetChangesets();

because the user login was only used in the recentChangesetProvider and not in any other.

you can also get the code with all the changes here :
https://github.com/RubenWillems/AutoMerge/tree/TeamChanges
if you want to try it out before merging

@CDuke
Copy link
Owner

CDuke commented Jun 9, 2018

Hi. Build failed. I can't merge pull request

@RubenWillems
Copy link
Contributor Author

I'll have a look in fixing this, ...

@RubenWillems
Copy link
Contributor Author

I've been looking into it for some time, but am not able to fix it. It works and compiles perfectly in VS2017.
so from perspective of the code it's ok. From looking at the build file, it only targets VS 14 and Vs12
which I think correlates to running batch files build12.bat and build14.bat. These fail on my system because I do not have that Visual Studio installed. I get
VSSDK1028: C:\Program Files (x86)\MSBuild\Microsoft\VisualStudio\v14.0\VSSDK\Microsoft.VsSDK.targets(913,5): Can not find the tools for VS SDK.
build15.bat runs flawless on my machine
any idea on how to fix this issue ?

@RubenWillems
Copy link
Contributor Author

YES, build is ok
the error messages where awkward to pinpoint the problem, but it is ok now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants