MarcDuerst Posted April 5, 2011 Report Share Posted April 5, 2011 Hi, We are currently evaluating a new SCM - a DVCS to be more exactly. Beside Git, Mercurial and others we also take a closer look on Plastic SCM. We created a sample workflow with several tests in to test all the DVCS products against the same use-cases / workflows. While doing this test for Plastic some general questions occur. Maybe someone can give us some tips here: Scenario is DVCS with two workstations (featuring local repos) and a central repo push/pull (Branches > Replication). 1) Both workstations change the same file. WS1 pushes. WS2 pulls and likes to get the changes from WS1 before commiting its own changes. In Git we uses Stash > Pull > Rebase > Stash Pop to get this. In Plastic WS2 seems to stay on an its older revision and as soon as we try to check it in a merge will be required. Can this be done somehow before attempting to check-in? 2) Ignore-files: Can we add an ignore file that totally ignore all directories called "ignore*"? 3) We have a common framework we use in many customer projects. Can we have it in a separate repository (or something like this) and reference/include it in the project repositories? Something like Subversions "externals" definition. If there is a way: can we specify the branch / version to reference? Any help on these topics would be great! Cheers, Marc Link to comment Share on other sites More sharing options...
This topic is now archived and is closed to further replies.