We’ve converted to Subclipse now and it seems a little more speedy than Subversion, however the concept of fixing conflicts is not really very straight forward in this software.
In Subverssion, where there was a conflict, we could use the ‘Override and Commit’ to move local changes to the SVN, that option is not in Subclipse?
‘Mark as Merged’ seems like the only way to resolve conflicts without overwriting local resources - and (to my mind anyway) that suggests that the conflict is simply discounted and the differences are not actually resolved? Is that how it works?
What’s the best way to resolve conflicts if you want to apply the local changes to the SVN in Subclipse?
Kahuna:
We’ve converted to Subclipse now and it seems a little more speedy than Subversion, however the concept of fixing conflicts is not really very straight forward in this software.
In Subverssion, where there was a conflict, we could use the ‘Override and Commit’ to move local changes to the SVN, that option is not in Subclipse?
‘Mark as Merged’ seems like the only way to resolve conflicts without overwriting local resources - and (to my mind anyway) that suggests that the conflict is simply discounted and the differences are not actually resolved? Is that how it works?
What’s the best way to resolve conflicts if you want to apply the local changes to the SVN in Subclipse?
with mark as merged yes, and then say use my version of the file (instead of use the incoming version of the file)
I find the Override and commit quite a dangerous option, then i think i even never would have used,
just as i almost never use mark as merged-> use my version, i almost always try to merge them in the compare window by copying the changes over. Or say that i want the incoming version.
jcompagner:
just as i almost never use mark as merged-> use my version, i almost always try to merge them in the compare window by copying the changes over. Or say that i want the incoming version.
Where is the ‘mark as merged-> use my version’ in the menu Johan? And I don’t seem to be able to edit the remote file in compare editor either. I’ve obviously not got it!
Sorry was not completely clear:
First does do an update
Then you have a conflict file
there you can say on Mark Resolved… that will bring up an dialog with options what you exactly want to do.
Before that you can first say-> Edit Conflicts that will bring up the compare window with the conflict pointed out to you.
jcompagner:
Sorry was not completely clear:
First does do an update
Then you have a conflict file
there you can say on Mark Resolved… that will bring up an dialog with options what you exactly want to do.
Before that you can first say-> Edit Conflicts that will bring up the compare window with the conflict pointed out to you.
Sorry Johan - I’m being totally dumb here - but I don’t understand your method. Here’s what I have:
I get a conflict and I view it in the conflict editor. On the right I have a different tooltip to my local version (not a big deal but I want to use it as an example).
I cant edit the right side pane, and the right-click menu on the element in the sync pane only allows me to Mark As Merged or Update?
If I mark as Merged then my local version seems to be updated???
How do I get the remote version to match the local version in this instance? My local version is the Master.
you can edit the right value, thats logical because thats the server value.
You can only edit your working copy and thats the left.
I was talking about files that are really in conflict. So you changed the exact same line in your working copy as the server did
Then when you update it you get a file that has the status Conflict
On those files Team->Edit Conflicts… or Team-> Mark as Resolved… are enabled.
I dont know exactly in what state you are with your files. Did you already really do an update?
Or are you purely in the synchronize view before an update. And then you are viewing it.
I dont know what then Mark as Merged should really do. I guess you should ask a svn guy that.
EDIT: i just did it, so in a synchronize view i had a conflict, i changed the same line. Then i say mark as merged, and i just kept my change.
After that i could commit the change that i made in to svn.
I have two svn repositories on two different server (one only for internal use and the other for external connections).
When I disconnect a solution from one svn repository and would like share it with the other svn repository server, it does not work! I don’t have deleted the SVN meta information while disconnecting. In the Share Project dialog I get only the Host address from my previous svn repository server.
Is there a save way to change to an other svn repository server and/or do have both?
ROCLASI:
What are you trying to do exactly. You want to share/commit it to the external SVN and then connect it back again to the internal SVN ?
Normally not! But sometimes I would like to commit an “internal” project to the external svn repo server and/or I have different projects for internal and external. If I have shared a project to the internal server I also would like the share/commit it to the external… if possible.
You can’t share a project to 2 SVN repositories at the same time and switching back and forth between then is also not recommended.
If the only thing you want to do is to put it on the external SVN for others to checkout then you could setup a new workspace. Export your solution from your original workspace, import it into the new workspace and share it with the external SVN server. This way you have one workspace that is for internal use and one for the external SVN.
I have shared my projects to the svn repository. When I checkout a solution on an other computer I’m missing my styles.
How can I share/checkout my styles?
I have shared also my Resources to the SVN server and… how wonder… I could checkout my styles!
But now I’m struggeling to get a solution from the SVN Repository server by checking out on my MacBook (Mac OS X, Servoy 522).
I’m connected to the SVN Repository. I see all my projects listed in the SVN Repository view. When I rightclick on a item and “Checkout…”, the workspace is successfully transfered to my local workspace.
But I have no solutions in the “Solution Explorer”!? On Windows it works as expected. Why not on my MacBook, running Mac OS X?
I got it to checkout my solutions and gambled a bit with SVN repository server.
For my projects I think SVN is much better than team support by servoy repository, but even different to handle.