wvd_vegt Posted March 25, 2012 Report Share Posted March 25, 2012 Hi, To make things easier for non power-users: is it possible to make the branch explorer more interactive (ie allow branches to be dragged and dropped on the main branch in order to merge). Also in the Visual Studio (using plastic plugin package) there is no clear option to create a branch other that check-in into other branch (where one might think the other branch should already exits). Currently this is the only place I found to create a branch from within VS2k10. As for the merging, it took me the following to merge back to the main branch: I did not find an easy way to merging a branch back to the main branch. (had to use the client for it and i found i it pretty hard and confusing as the obvious command merge from other branch did not result in any merges). I had to switch to the main branch first (loosing my changed files in the ide, which makes me nervous) and then i managed to merge somehow. Arrows where dotted and linked backwards (from right to left) to the main branch. After the merge, the commit/check-in was hard again as plasticscm's client complained about merge links. I revolved that by checking in the whole project instead of one of it's projects. After this the arrows point forward again (which is re-assuring) to the new changeset on main branch. A drag and drop operation followed by a question to check things etc in would much simplify life. Lastly: is there an easy way to switch between the two scm plugins? wvd_vegt Link to comment Share on other sites More sharing options...
manu Posted March 26, 2012 Report Share Posted March 26, 2012 Hi wvd_vegt, are you using the SCC plugin or the new Plastic SCM 4.0 Visual Studio Package integration? Link to comment Share on other sites More sharing options...
cidico Posted March 26, 2012 Report Share Posted March 26, 2012 Drag and drop on branch explorer to perform merge operations would be great!! Link to comment Share on other sites More sharing options...
manu Posted March 26, 2012 Report Share Posted March 26, 2012 Minority report style hehehe Link to comment Share on other sites More sharing options...
cidico Posted March 26, 2012 Report Share Posted March 26, 2012 Imagine doing merge from a tablet via touch... It's even a Marketing showcase... hehehe Link to comment Share on other sites More sharing options...
manu Posted March 26, 2012 Report Share Posted March 26, 2012 Link to comment Share on other sites More sharing options...
cidico Posted March 26, 2012 Report Share Posted March 26, 2012 That's why I love you guys! Link to comment Share on other sites More sharing options...
manu Posted March 26, 2012 Report Share Posted March 26, 2012 hehehehe thanks! We will think about the merge touch! Link to comment Share on other sites More sharing options...
wvd_vegt Posted March 27, 2012 Author Report Share Posted March 27, 2012 Hi, Using the new plastic plugin (I think). I hope that it was a smart move ;-) Btw it's hard to switch back to the SCC one in VS2010. Any suggestions on that? Link to comment Share on other sites More sharing options...
manu Posted March 27, 2012 Report Share Posted March 27, 2012 Hi Wvt_vegt, can I connect with you 5 minutes to review your VS status? Link to comment Share on other sites More sharing options...
wvd_vegt Posted April 10, 2012 Author Report Share Posted April 10, 2012 Hi Sorry for the delay (beeing busy.) Fridays would suit me (european time). Just send me a e-mail with what i need to do. wvd_vegt Link to comment Share on other sites More sharing options...
manu Posted April 11, 2012 Report Share Posted April 11, 2012 Hello wvd_vegt! we will try to do it this Friday! But meanwhile: To make things easier for non power-users: is it possible to make the branch explorer more interactive (ie allow branches to be dragged and dropped on the main branch in order to merge). Cool feature, you can add it in our user voice system: https://plasticscm.uservoice.com/ Also in the Visual Studio (using plastic plugin package) there is no clear option to create a branch other that check-in into other branch (where one might think the other branch should already exits). Currently this is the only place I found to create a branch from within VS2k10. Wow!! I think you are missing all the plugins views!!! Check this out: As for the merging, it took me the following to merge back to the main branch: I did not find an easy way to merging a branch back to the main branch. (had to use the client for it and i found i it pretty hard and confusing as the obvious command merge from other branch did not result in any merges). I had to switch to the main branch first (loosing my changed files in the ide, which makes me nervous) and then i managed to merge somehow. Arrows where dotted and linked backwards (from right to left) to the main branch. After the merge, the commit/check-in was hard again as plasticscm's client complained about merge links. I revolved that by checking in the whole project instead of one of it's projects. After this the arrows point forward again (which is re-assuring) to the new changeset on main branch. A drag and drop operation followed by a question to check things etc in would much simplify life. Again, you can use the Plastic SCM view inside VS Lastly: is there an easy way to switch between the two scm plugins? Yes, first you have to unbind the solution and projects from the SCC plugin and then bind again the project with the new Plastic SCM package. Link to comment Share on other sites More sharing options...
wvd_vegt Posted April 11, 2012 Author Report Share Posted April 11, 2012 Hi, I think you are missing all the plugins views!!! Check this out: Just encountered this menu-option. I will explore it. regards wvd_vegt Link to comment Share on other sites More sharing options...
manu Posted April 11, 2012 Report Share Posted April 11, 2012 Sure! Tell me if you need some help! Link to comment Share on other sites More sharing options...
psantosl Posted April 11, 2012 Report Share Posted April 11, 2012 Regarding the "merge on drag"... Ok, it has been requested several times, make sure it is in http://plasticscm.uservoice.com, vote it, describe it... and we'll see what we can do. My concern is that, while cool, I think it will be rather confusing... I mean, when you really have a bunch on branches... wouldn't it be difficult to "drag and drop"? Do you really think it will be easier than right-clicking on the source branch and selecting "merge from this branch"? Would it be faster? I don't think so, but I'm open to implement it if you convince me. Link to comment Share on other sites More sharing options...
wvd_vegt Posted April 14, 2012 Author Report Share Posted April 14, 2012 Hi Faster is also things like typing commands on a commandline which isn't regarded as user friendly but is more powerfull than gui's most of the time. I requested/suggested the feature as a way to ease the learning curve (personally I find merge from this branch confusing as i do not see where it will be merged into). A menuitem 'merge into main branch' would perhaps better describe it. Link to comment Share on other sites More sharing options...
manu Posted April 16, 2012 Report Share Posted April 16, 2012 I find merge from this branch confusing as i do not see where it will be merged into). But, if you are switching to the merge destination branch IMHO I think it's easy to view that the merges are going to be stored in the branch I'm working on... Maybe I'm contaminated and it's hard to me to understand your point of view. Link to comment Share on other sites More sharing options...
wvd_vegt Posted April 16, 2012 Author Report Share Posted April 16, 2012 Hi, Yeah, i think i will get used to it once i use branching a bit more. It's just that i get nervous if a VCS starts removing my work during a branch switch (and I have to hope the database still contains my hours of work). Just use it and don't worry to much is probably the way to go ;-) Link to comment Share on other sites More sharing options...
manu Posted April 16, 2012 Report Share Posted April 16, 2012 Don't worry about it, all is inside the Plastic SCM repository. Once you have all committed you are safe! and if you don't have your changes committed Plastic SCM will complain about with when switching between branches. Link to comment Share on other sites More sharing options...
wvd_vegt Posted April 17, 2012 Author Report Share Posted April 17, 2012 Hi I try not to worry but I carry 10+ years of sources with me (in SourceSafe) and would hate to loose any of that (I need it from time to time as the userbase is very diverse on application versioning). But I am a single developer so full fledged dvcs is not neccesary for me but things like branching etc sounds interesting and promising as i frequently do add new features. The selling points for plasticscm for me where the decent database underneath and the modern dotnet base (so no afternoon scripting that turned loose by escaping the lab, i just dislike that no matter how good such code is). I was getting fed up with the 10k+ files of sourcesafe, cvs and svn etc. And it does not condemn vss like working methods (check-ou/check-in). And lets not forget, active development and excellent support sofar. Link to comment Share on other sites More sharing options...
manu Posted April 17, 2012 Report Share Posted April 17, 2012 More than 10 years! That's a lot of work!! Even if you are a single developer I think you will find the "task per branch" methodology very interesting and "elegant". Link to comment Share on other sites More sharing options...
wvd_vegt Posted April 17, 2012 Author Report Share Posted April 17, 2012 Hi It's one of the reasons I want to look into branching as I have some high priority projects on the way and have some 'normal' softwre research to go on too. In my current project there are some code experiments present that are not available for users, only to me when debugging. There branching might be a much more elegant way. So even shelving looks interesting (I had some urgent request when i was in the middle of a bigger coding/refactoring operation and there shelving seems the way to go). But it's the workspace switch and replacing/removal the files I have to get used to. My experiences with branching in cvs and svn with Eclipse where not that successfull (and most of the time seriously screwed up my projects or gave funcky checkin problems). PlasticScm gives me the growth path without forcing me to discard the single user day-to-day routines I got used to with VSS (like checkin/checkout instead of the lazyer git/mercurial approach of just editing along and then see if it can be merged). Link to comment Share on other sites More sharing options...
manu Posted April 19, 2012 Report Share Posted April 19, 2012 So even shelving looks interesting (I had some urgent request when i was in the middle of a bigger coding/refactoring operation and there shelving seems the way to go). Yes, this is one of the main topics where the shelve operation is great. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.