WXS123

I want to catch a branch up to the trunk. I don't think pure merge will work as it seems to miss things and when I do a compare the branches are not equivalent. Is there a way to force a branch to be completely caught up with the trunk without rebranching



Re: Team Foundation Server - Version Control Force branch to be equal to trunk/top?

Richard Berg MSFT

Use the /force, Luke Smile

tf merge with the /force parameter will ignore any changesets you might have discarded (either with the /discard switch, or during the Resolve process). It requires you to specify /version. /version:1~T should always catch you up.

Note: this is still a merge, not some kind of a "make branches look identical" command. Some modifications that exist only on the target side, e.g. adds that were never RI'd, will never be affected by Merge.





Re: Team Foundation Server - Version Control Force branch to be equal to trunk/top?

WXS123

Richard Berg MSFT wrote:

Use the /force, Luke

tf merge with the /force parameter will ignore any changesets you might have discarded (either with the /discard switch, or during the Resolve process). It requires you to specify /version. /version:1~T should always catch you up.

Note: this is still a merge, not some kind of a "make branches look identical" command. Some modifications that exist only on the target side, e.g. adds that were never RI'd, will never be affected by Merge.

Ok. so then I'll still have some issues... Basically I created a test feature branch, worked on a feature that we won't RI, so then is the only answer to manually go in and try to adjust things It would be nice if there was some functionality to do this to work with feature branches in this way to avoid having to recreate the branch, metadata, etc. or having to delete it because it is too hard to catch up.





Re: Team Foundation Server - Version Control Force branch to be equal to trunk/top?

Richard Berg MSFT

You can use TreeDiff to automatically pend deletes, or any other necessary cleanup.

In our own usage of feature branches, we're getting close to the point where we'll have to create new branches for the next round or try to reuse them. If we choose the latter hopefully we'll tease out whatever pain points our current model causes.





Re: Team Foundation Server - Version Control Force branch to be equal to trunk/top?

WXS123

Richard Berg MSFT wrote:

You can use TreeDiff to automatically pend deletes, or any other necessary cleanup.

In our own usage of feature branches, we're getting close to the point where we'll have to create new branches for the next round or try to reuse them. If we choose the latter hopefully we'll tease out whatever pain points our current model causes.

Thanks. I'm thinking you will hit this one.. then hopefully make it easier Smile