Hi,

We are in the process of moving our stuff to TFS2010, but untill everything has 
moved we're stuck.
Is the merge permission in TFS2010 going to help us? Can one specify the merge 
direction within this permission?
(We want to be able to merge from Hotfix to servicepack but not from main to 
servicepack)

Do you have any additional info on this merge event?

Cheers,
Marcel


Marcel van Laar
Technisch Projectleider Softwareontwikkeling

Koper Automatisering B.V.
Lakenblekerstraat 49
1431GE Aalsmeer

Telefoon:+31 (0) 297 387 222
Fax:+31 (0) 297 387 214
Internet: www.koper-it.nl
E-mail:mailto:mvl...@koper-it.nl

________________________________________
From: oztfs-boun...@oztfs.com [oztfs-boun...@oztfs.com] on behalf of Daniel 
Sniderman [dani...@magenic.com]
Sent: 11 November 2010 18:48
To: ozTFS
Subject: RE: Restict merge

Be glad you aren't stuck on an instance of TFS 2005 Like I am right now!

(Guess it could be worse- could be VSS or Clearcase or something!)



-----Original Message-----
From: oztfs-boun...@oztfs.com [mailto:oztfs-boun...@oztfs.com] On Behalf Of 
Buck Hodges
Sent: Thursday, November 11, 2010 11:43 AM
To: ozTFS
Subject: RE: Restict merge

If you are able to move to TFS 2010 (I would highly recommend it, but I'm a bit 
biased :-), there is now a merge permission 
(http://msdn.microsoft.com/en-us/library/ms252587.aspx).

If you look at the PendingChange objects in the debugger and none shows a path 
for the source, then this isn't going to work for you.  While it wouldn't be a 
checkin policy, you may get what you need from the merge event.

Buck

-----Original Message-----
From: oztfs-boun...@oztfs.com [mailto:oztfs-boun...@oztfs.com] On Behalf Of 
Marcel van Laar
Sent: Thursday, November 11, 2010 2:23 AM
To: 'ozTFS'
Subject: RE: Restict merge

Hi,

I've been trying to develop such a checkinpolicy for TFS2008, but without 
succes.
Having the following branch structure:

Main--Dev
Main--ServicePack
ServicePack--Hotfix

I want to allow merges from HOTFIX to SERVICEPACK but restriction on merges 
from MAIN to SERVICEPACK.

In my checkinpolicy I have the following function:

    Public Overrides Function Evaluate() As 
Microsoft.TeamFoundation.VersionControl.Client.PolicyFailure()
        Dim failures As New List(Of PolicyFailure)

        For Each pc As 
Microsoft.TeamFoundation.VersionControl.Client.PendingChange In 
PendingCheckin.PendingChanges.CheckedPendingChanges
            If pc.IsMerge AndAlso 
pc.SourceServerItem.StartsWith("$/Project/Main") AndAlso _
                pc.ServerItem.StartsWith("$/Project/ServicePack") Then
                failures.Add(New PolicyFailure("Merges not allowed from Main to 
ServicePack", Me))
            End If
        Next

        Return failures.ToArray
    End Function


The problem is that pc.SourceServerItem is Nothing Any ideas about how to 
restrict this merge?

Thank you,
Marcel



Marcel van Laar
Technisch Projectleider Softwareontwikkeling

Koper Automatisering B.V.
Lakenblekerstraat 49
1431GE Aalsmeer

Telefoon:+31 (0) 297 387 222
Fax:+31 (0) 297 387 214
Internet: www.koper-it.nl
E-mail:mailto:mvl...@koper-it.nl

-----Original Message-----
From: oztfs-boun...@oztfs.com [mailto:oztfs-boun...@oztfs.com] On Behalf Of 
Benjamin, Benny
Sent: Wednesday, October 06, 2010 09:20
To: ozTFS
Subject: RE: Restict merge

Not in the scenario you described below.
If you put the merge restriction on ServicePack it will restrict all merges to 
ServicePack.
If you need to select which branch are disallowed to merge to it, I don't think 
you can do that.
The closest I can think of would be to implement that as a checkin policy, 
which is not particularly restrictive.

____________________________________________________________________________________
Commonwealth Bank
Benny Benjamin
Developer
Service Development | Enterprise Services
Phone: 8292 4659
eMail:  benny.benja...@cba.com.au
Level 13, 363 George Street SYDNEY NSW 2000 Our vision is to be Australia's 
finest financial services organisation through excelling in customer service


-----Original Message-----
From: oztfs-boun...@oztfs.com [mailto:oztfs-boun...@oztfs.com] On Behalf Of 
Marcel van Laar
Sent: Wednesday, 6 October 2010 6:12 PM
To: 'ozTFS'
Subject: RE: Restict merge

Thank you for your reactions.

But will this not restrict all merges to main, even from our development branch?


Marcel van Laar
Technisch Projectleider Softwareontwikkeling

Koper Automatisering B.V.
Lakenblekerstraat 49
1431GE Aalsmeer

Telefoon:+31 (0) 297 387 222
Fax:+31 (0) 297 387 214
Internet: www.koper-it.nl
E-mail:mailto:mvl...@koper-it.nl

-----Original Message-----
From: oztfs-boun...@oztfs.com [mailto:oztfs-boun...@oztfs.com] On Behalf Of 
Benjamin, Benny
Sent: Wednesday, October 06, 2010 09:02
To: ozTFS
Subject: RE: Restict merge

In TFS 2010 "Merge" is a folder permission.
As far as I know this is not available in TFS 2008 or TFS 2005.

Regards,

____________________________________________________________________________________
Commonwealth Bank
Benny Benjamin
Developer
Service Development | Enterprise Services
Phone: 8292 4659
eMail:  benny.benja...@cba.com.au
Level 13, 363 George Street SYDNEY NSW 2000 Our vision is to be Australia's 
finest financial services organisation through excelling in customer service


-----Original Message-----
From: oztfs-boun...@oztfs.com [mailto:oztfs-boun...@oztfs.com] On Behalf Of 
Ewald Hofman
Sent: Wednesday, 6 October 2010 6:00 PM
To: ozTFS
Subject: RE: Restict merge

You can do that with the security on folders in source control

Ewald Hofman

-----Original Message-----
From: oztfs-boun...@oztfs.com [mailto:oztfs-boun...@oztfs.com] On Behalf Of 
Marcel van Laar
Sent: woensdag 6 oktober 2010 8:47
To: 'oztfs@oztfs.com'
Subject: Restict merge

Hi list,

Is it possible to restict the merge direction in TFS?
We have a main and from that a branch called ServicePack, we want to merge from 
servicepack to main but not from main to servicepack. Is this possible?

Thank you,
Marcel

Marcel van Laar
Technisch Projectleider Softwareontwikkeling

Koper Automatisering B.V.
Lakenblekerstraat 49
1431GE Aalsmeer

Telefoon:+31 (0) 297 387 222
Fax:+31 (0) 297 387 214
Internet: www.koper-it.nl
E-mail:mailto:mvl...@koper-it.nl



Dit bericht bevat vertrouwelijke informatie die uitsluitend bestemd is voor 
oz...@oztfs.com. Indien u niet oztfs@oztfs.com bent, is openbaarmaking, 
verspreiding en/of vermenigvuldiging van dit bericht, verboden. Indien u dit 
bericht abusievelijk heeft ontvangen, wordt u verzocht mvl...@koper-it.nl 
hiervan onmiddellijk per e-mail op de hoogte te brengen en het bericht 
vervolgens van uw systeem te verwijderen. Veilige en foutvrije verzending van 
e-mails kan niet worden gewaarborgd. Berichten kunnen bijvoorbeeld worden 
onderschept, beschadigd,vernietigd of vertraagd, verloren gaan, een deel van 
hun inhoud verliezen of met een virus worden ge?nfecteerd.Marcel van Laar 
aanvaardt geen aansprakelijkheid voor eventuele fouten of weglatingen in dit 
bericht, enig deel van dit bericht, of in de bijlagen, die het gevolg zijn van 
de verzending. Vraag ons indien nodig om een afdruk van het oorspronkelijke 
bericht voor verificatie van de inhoud.


_____________________________________________________________________________________________
This message has been checked for all known viruses by KPN IV-Scan, powered by 
MessageLabs.
For further information visit: http://www.koper-it.nl

_____________________________________________________________________________________________
_______________________________________________
oztfs mailing list
oztfs@oztfs.com
http://prdlxvm0001.codify.net/mailman/listinfo/oztfs
_______________________________________________
oztfs mailing list
oztfs@oztfs.com
http://prdlxvm0001.codify.net/mailman/listinfo/oztfs

************** IMPORTANT MESSAGE ***************************** This e-mail 
message is intended only for the addressee(s) and contains information which 
may be confidential.
If you are not the intended recipient please advise the sender by return email, 
do not use or disclose the contents, and delete the message and any attachments 
from your system. Unless specifically indicated, this email does not constitute 
formal advice or commitment by the sender or the Commonwealth Bank of Australia 
(ABN 48 123 123 124) or its subsidiaries.
We can be contacted through our web site: commbank.com.au.
If you no longer wish to receive commercial electronic messages from us, please 
reply to this e-mail by typing Unsubscribe in the subject line.
**************************************************************



_______________________________________________
oztfs mailing list
oztfs@oztfs.com
http://prdlxvm0001.codify.net/mailman/listinfo/oztfs

_____________________________________________________________________________________________
This message has been checked for all known viruses by KPN IV-Scan, powered by 
MessageLabs.
For further information visit: http://www.koper-it.nl

_____________________________________________________________________________________________

_____________________________________________________________________________________________
This message has been checked for all known viruses by KPN IV-Scan, powered by 
MessageLabs.
For further information visit: http://www.koper-it.nl

_____________________________________________________________________________________________
_______________________________________________
oztfs mailing list
oztfs@oztfs.com
http://prdlxvm0001.codify.net/mailman/listinfo/oztfs

************** IMPORTANT MESSAGE ***************************** This e-mail 
message is intended only for the addressee(s) and contains information which 
may be confidential.
If you are not the intended recipient please advise the sender by return email, 
do not use or disclose the contents, and delete the message and any attachments 
from your system. Unless specifically indicated, this email does not constitute 
formal advice or commitment by the sender or the Commonwealth Bank of Australia 
(ABN 48 123 123 124) or its subsidiaries.
We can be contacted through our web site: commbank.com.au.
If you no longer wish to receive commercial electronic messages from us, please 
reply to this e-mail by typing Unsubscribe in the subject line.
**************************************************************



_______________________________________________
oztfs mailing list
oztfs@oztfs.com
http://prdlxvm0001.codify.net/mailman/listinfo/oztfs

_____________________________________________________________________________________________
This message has been checked for all known viruses by KPN IV-Scan, powered by 
MessageLabs.
For further information visit: http://www.koper-it.nl

_____________________________________________________________________________________________

_____________________________________________________________________________________________
This message has been checked for all known viruses by KPN IV-Scan, powered by 
MessageLabs.
For further information visit: http://www.koper-it.nl

_____________________________________________________________________________________________
_______________________________________________
oztfs mailing list
oztfs@oztfs.com
http://prdlxvm0001.codify.net/mailman/listinfo/oztfs

_______________________________________________
oztfs mailing list
oztfs@oztfs.com
http://prdlxvm0001.codify.net/mailman/listinfo/oztfs
_______________________________________________
oztfs mailing list
oztfs@oztfs.com
http://prdlxvm0001.codify.net/mailman/listinfo/oztfs

_____________________________________________________________________________________________
This message has been checked for all known viruses by KPN IV-Scan, powered by 
MessageLabs.
For further information visit: http://www.koper-it.nl

_____________________________________________________________________________________________

_____________________________________________________________________________________________
This message has been checked for all known viruses by KPN IV-Scan, powered by 
MessageLabs. 
For further information visit: http://www.koper-it.nl

_____________________________________________________________________________________________
_______________________________________________
oztfs mailing list
oztfs@oztfs.com
http://prdlxvm0001.codify.net/mailman/listinfo/oztfs

Reply via email to