Extend check-in Functionality

Question

After check-in I would like to merge(baseless) those same changes into other branches, and pop-up any conflicts.  For example, if i checkin changes into the November release branch, I would like a utility to automatically merge those changes into the December release branch.

My intension is to get the changesetID, and use it to get the FullPath of all the files that changed for that changeset. Then using a config file to determine what other branches these changes need to be merged to.  Then create & execute commandline merge(baseless) for each item.

I'm not sure what object/event to extend.

Answer 1

You can use the checkin event (http://msdn.microsoft.com/en-us/magazine/cc507647.aspx), or you can add the tf merge command (http://msdn.microsoft.com/en-us/library/bd6dxhfy(VS.80).aspx) to the build script (use the Exec task: http://msdn.microsoft.com/en-us/library/x8zx72cd.aspx).

---

Ewald - Please remember to mark the replies as answers if they help.


Blog: www.ewaldhofman.nl

Answer 2

What I trying to do is setup somthing that is similar to the checkin policy, but will run after checkin.  So when a developer checks in changes, a process would run the tf merge command on their changes, and if a conflict happens the developer can correct it immediately.  I dont think that adding the tf merge command to the build script would work since we dont do CI builds. 

If I use the checkin event, would it pop-up conflicts on the developer's machine?  Form what i have been reading, it seems as though the checkin event is on the server, therefore the best I could do is to send them an email if a conflict occurs.

Answer 3

Marc,

A Visual Studio add-in can be written to do this.  Sign up for the CommitCheckin event on the VersionControlServer object.  This event passes in information about the check-in where the add-in can decide if it should pend a merge or not.  

Ed 

---

http://blogs.msdn.com/edhintz