Move changesets to different branch
Oops I wanted these changes on that branch. Why not just let me move them?
We are very, very happy to close the TOP 1 UserVoice request :-)
-
Signa Tech commented
https://signatech.com/services/business-intelligence/
business intelligence consulting servicesEnhance your decision-making with our business intelligence consulting services. We specialize in transforming raw data into actionable insights, empowering your business to thrive. Our expert team delivers tailored BI solutions, including data analytics, visualization, and reporting, to optimize performance and drive growth. Stay ahead of the competition with our innovative approaches, ensuring you make informed decisions. Partner with us for top-tier business intelligence consulting services that propel your business forward.
-
Steven Cramer commented
You guys Rock!!!!! Thank you. Best DVCS ever.
-
psantosl commented
Hi Todd,
You can configure this behavior to "protect branches from checkin except when merging" by adding a before-checkin trigger and checking the PLASTIC_PENDING_MERGE_LINKS variable.
We are looking how to enable this with permissions though.
-
Todd Alden commented
How about a different angle on the problem...
I see the problem (at least for the user cases we have) as checking in changes I've personally made to files but I'm not actually in a task branch. So, in at least my cases, the problem is allowing checkin, that is not from the result of a merge, on something other than a task branch. So how about having a way (permission maybe?) to limit checkin on certain branches to ONLY be checkins that are completing a pending merge operation. Checking in pending changes just because I've edited files (or added files, etc) would be blocked. That would, for us, eliminate the problem at the root cause. -
Todd Alden commented
I would support this ONLY as a feature that combined the delete of a "tip" changeset" and creating the changeset as a tip on a different branch. This would really just be a shorthand for operations we can already do today and should be under the same ACL rules. E.g. if you do not have delete changeset permisions, you would not be able to do this.
-
Göran Wallgren commented
A more lightweight way to implement this could be the following request:
https://plasticscm.uservoice.com/forums/15467-general/suggestions/7010758-create-shelve-from-changeset -
Seto commented
Cherry pick and a subtractive merge will solve this. Right?
-
Andrew R commented
Just happened to me again where I create a branch from the child branch instead of the main line. Would like to see the ability to cherrypick the changes into a shelf or different branch. I would then rename the incorrect branch, apply the changes in the correct branch and could delete the incorrect branch. Thanks.
-
Steven Cramer commented
@gihrig Don't feel bad. It happens to me way to often also. if you could drum up some votes maybe we could get this moved up priority list.
-
gihrig commented
OK, so now it's late July and I have a need to move a late branch to an earlier parent. There's a _lot_ of work done in main over a considerable period that has to be backed out, but the very latest branch must be kept... :-(
-
gihrig commented
Well, I did it again. :-/
Git can move existing commits between branches...
http://stackoverflow.com/questions/1628563/how-can-i-move-recent-commits-to-a-new-branch-with-git
-
gihrig commented
Maybe I'm just distracted, but this happens to me several times a month. It would be wonderful to have this feature.