Search Results

Search found 5354 results on 215 pages for 'mod dav svn'.

facebook twitter digg google delicious technorati stumbleupon myspace wordpress linkedin gmail igoogle windows live tumblr viadeo yahoo buzz yahoo mail yahoo bookmarks favorites email print

Page 68/215 | < Previous Page | 64 65 66 67 68 69 70 71 72 73 74 75  | Next Page >

  • How to configure Beyond Compare 3 for Eclipse conflict resolution?

    - by Peter Boughton
    What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution? In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts. The default parameters are: "${yours}" "${theirs}" "${base}" "${merged}" And it suggests TortoiseMerge settings of this: /theirs:"${theirs}" /base:"${base}" /mine:"${yours}" /merged:"${merged}" But what is the appropriate config for Beyond Compare?

    Read the article

  • Subclipse does not recognize my project as an SVN project

    - by Nicolas Raoul
    From SVN I checked out a "myproject" folder to my hard drive. It happens to be an Eclipse project, so I imported it into Eclipse and I can work on it. I have Subclipse installed and working as expected on other projects in the same Eclipse workspace. But for some reason, "myproject" does not have the usual Subclipse controls like TeamCommit or the decorations. Did I miss any obvious steps?

    Read the article

  • How do I correct "Commit Failed. File xxx is out of date. xxx path not found."

    - by Ryan Taylor
    I have recently run into a particularly sticky issue regarding committing the result of a merge in subversion. Our Subversion server is @ 1.5.0 and my TortoiseSVN client is now @ 1.6.1. I am trying to merge a feature branch back into my trunk. The merge appears to work okay; however, the commit fails with the following error message. Commit failed (details follow): File 'flex/src/com/penbay/invision/portal/services/http/soap/ReportServices/GetAllBldgsParamsByRegionBySiteResultEvent.as' is out of date '/svn/ibis/!svn/wrk/531d459d-80fa-ea46-bfb4-940d79ee6d2e/visualization/trunk/source/flex/src/com/penbay/invision/portal/services/http/soap/ReportServices/GetAllBldgsParamsByRegionBySiteResultEvent.as' path not found You have to update your working copy first. My working trunk is up to date. I have even checked out a new one into a different folder to make sure there wasn't any local cruft messing with the merge. I have done some more research into this and I think part of the problem is user error. I think our problems are: We had some developers committing work with a subversion client before 1.5 and some after. I believe this has the potential to corrupt the merge info. In other branches we have performed partial merges. That is, we did not always perform merges at the root of the branch. This was to facilitate updating Flex and .NET efforts within the same branch. We performed cyclic (reflexive) merges on our branch. This was done because we had multiple parallel branches and we wanted to periodically update our branch with the latest code in trunk. All of these things are explicitly not recommended by the Subversion book/team. We have learned our lesson and now know the best practices. However, we first need to merge and commit our latest branch. What it the best way to correct the problems we are encountering? Would deleting all the merge info in the trunk and branch be a viable solution? No. I have done this but it does not resolve the error that I am getting above.

    Read the article

  • Add existing project to solution under visualvsn

    - by Eric
    We are changing from SourceSafe 2005 to visual svn. How can an exisiting project be added to a solution Example: I create solution1 with 3 projects and add to /trunk I create solution2 with 1 project and add to /trunk In solution1 I add existing project from solution2, but I cannot add to subversion. I get "out of working copy, use the VisualSVN-Set Working Copy root menu" In SourceSafe2005 it would just link, what is the procedure for VisualSVN? Branch? Regards _Eric

    Read the article

  • Repository organization and selective checkout

    - by Maurizio Reginelli
    I am using TortoiseSVN and I have a SVN repository organized in this way: folder1 folder2 trunk tag branches folder3 trunk tag branches folder4 folder5 trunk tag branches I would like to know if there is a way to checkout only trunk directories, keeping the entire tree under the versioning control: folder1 folder2 trunk folder3 trunk folder4 folder5 trunk In this way I can update all trunks with a single update command on folder1, without updating tags and branches which can be full of data.

    Read the article

  • Is there an encrypted version control system?

    - by Mike
    I am looking for an encrypted version control system . Basically I would like to -have all files encrypted locally before sending to the server. the server should never receive any file or data unencrypted. -Every other feature should work pretty much the same way as SVN or CVS does today. Can anyone recommend something like this? I did a lot of searches but I cant find anything.

    Read the article

  • Good book for learning Bourne shell?

    - by John Isaacks
    I want to learn how to write shell scripts. Particularly I want to write a svn post-commit script to upload files from a test server to a production server. I am sure I will want to write more as I get more into it. I have very little linux/unix knowledge. Can anyone recommend a good book?

    Read the article

  • Bitbucket, Assembla.. or what?

    - by Artemix
    So, after a while of researching what SVN system should I use, I end up creating a project in Google Code.. thing is, that ANYONE can habe access to my repository, and is NOT what I want :) So, I'm looking for a "private Google Code" code hosting web. I found out that Bitbucket and Assembla are good, but.. any opinions? Thx!

    Read the article

  • Quick start on visual studio 2010 with SVN

    - by Shawn Mclean
    The only source control I ever used was SourceGear Vault on my local machine. I need to put a new project on a svn server I got at beanstalkapp. I installed tortoiseSVN and AnkhSVN. I successfully connected everything, I see 3 folders: branches tags trunks I created my project and I want to attach it to the server, which of these folders do I select? What is the use of the these folders?

    Read the article

  • What is the proper way to do a Subversion merge in Eclipse?

    - by awied
    I'm pretty used to how to do CVS merges in Eclipse, and I'm otherwise happy with the way that both Subclipse and Subversive work with the SVN repository, but I'm not quite sure how to do merges properly. When I do a merge, it seems to want to stick the merged files in a seperate directory in my project rather than overwriting the old files that are to be replaced in the merge, as I am used to in CVS. The question is not particular to either Subclipse or Subversive. Thanks for the help!

    Read the article

  • Describe your workflow of using version control (VCS or DVCS)

    - by edwin.nathaniel
    I'd like to learn other people workflow when using either SVN or GIT. Please describe your strategy to handle the following tasks: Implement a feature Fixing bugs (during development and deployed app) Code Review Refactoring code (post code-review) Incorporate patches Releasing the newer version of your app (desktop, web, mobile, would you treat them differently?) Feel free to organize your answer not grouped by the tasks but grouped by whatever you think is relevant but please organize it by VCS/DVCS (please don't mix them). Thank you.

    Read the article

  • Is there a free version control server provider for non-public projects?

    - by ttobiass
    I'd like to have a version control server (preferably SVN) accessible on the internet without having to host my own (linux) server. Setting up a home server ala DynDNS is not really an option. Can you have non-public (maybe single-user) projects on one of the OSS project hosting sites? Or are there alternatives? I had a look at Google Code. But that looked very public to me. Any help would be greatly appreciated :-)

    Read the article

facebook twitter digg google delicious technorati stumbleupon myspace wordpress linkedin gmail igoogle windows live tumblr viadeo yahoo buzz yahoo mail yahoo bookmarks favorites email print

< Previous Page | 64 65 66 67 68 69 70 71 72 73 74 75  | Next Page >