Hi again Johan,
There are a few special cases to handle:
* What if the file was changed on the workspace prior to the merge you want to redo? (Whether manually modified or as a result of a previous merge?). Should we go back to the previous content? It is far from trivial in most cases.
Yes, understood. Just to make it crystal clear:
* You ALREADY merged a file.
* But you need an option in Pending Changes that says "restart merge for this file"
Sounds like a good idea.
How do you see this?? I mean, some sort of "create repo using template" that immediately setups some branch names??
Are you aware of any scripts available to merge this?? If so, it would take us minutes to get it integrated.
Are you using the latest 5.0 release?? Have you seen the improvements to item merge tracking there?
I think this fixes the issues you mention, correct?
Are you using C#? If so, why don't you take a look at "method history"?
Nice one! Looks a little bit difficult but doable! :)
We hope to have it working in a few days... but not there yet! :(
Yes Ignacio, please keep in mind the "known restrictions" we sent to all alpha testers :)
"* The plastic repository can be only synchronized with a single git
repository. It means, it will only receive/push changes from/to git.
This mapping cannot be changed. (It is totally temporary, we'll overcome
Does shelve help?
Does shelve help?psantosl supported this idea ·
We've some questions about this one after talking about it. Would you mind contacting us to discuss?
It is so cool that we're going to get it done... :) We're still considering some pros and cons, but I talked to the team today and we all agree it will be a cool poster feature :)
Do you mean adding a way to download content from SVN or git?
We're about to release the beta of "bisync" which let's you push and pull from plastic to git (github, bitbucket, whatever...). I think it will be helpful too!
Do you mean repositories or workspaces?
If workspaces: to create a wk, you've to get access to the remote client machine (not server) which I think is a little bit off-topic, isn't it?
Yes, this would be awesome... Certainly something to look at.
Any preferred user system? Facebook? google? Anyone?
Well, it is a nice idea. This way when you look into file history you can see how a file was split into two or more...
It is not the first time we consider it. Old SVN had it too (some option in the copy command).
I'm thinking about how to implement it: maybe some sort of:
cm split foo.c foo-partial.c that simply links the two files or something similar.
Then some sort of special link between the revisions so that history can follow the links and so on... would it be fine? All including some sort of cool GUI :)
Maybe instead of cm split, some sort of "cm link" to add a "history link" between two revisions... what do you think? Sounds lower level but doable too :)
Very interesting thread by the way!
It depends a lot on the specific team. For big ones, the admin is the one controlling the update, so letting everyone to upgrade can be an ugly behavior.
For small teams it would be fine, though.
All ideas on this will be more than welcome! :)
We'll be readding this feature... got "lost in translation" while moving from 3.0 to 4.0 (on purpose)
In fact we've the command, but we need to renew it to get it back up and running on 4.0.
Anyway, are the inconsistencies something common? They shouldn't!
We'll review it early next week.
So Lane, which features do you have exactly in mind? Can you share them with us?
Yes! We definitely need to improve the Eclipse part! :)
You've multiple selection. You can create a single sync view with several sources and targets. Then do a multi-selection, then push or pull.
Not exactly the whole thing... but most of it is here! http://codicesoftware.blogspot.com/2012/02/after-accidentally-cloning-sexy.html
When you add a new tree, you add a new changeset because if you've the right options configured (which I personally don't like much) it gets checked-in directly.
We can use the blog so you'll see it in the "RSS" panel.
But yes, we can add an specific icon telling you there's a new version. The only "issue" is that you need to get the server upgraded (sometimes) so... But ok, we'll figure out something.