Search Results

Search found 4989 results on 200 pages for 'svn merge'.

Page 20/200 | < Previous Page | 16 17 18 19 20 21 22 23 24 25 26 27  | Next Page >

  • SVN Path Based Authorization: Granting listing access but not read access

    - by Jim
    Hello, We're using path-based-authorization module for Apache SVN. It all works fine, except that when users try to check out code they have access to, their SVN clients get confused if they don't have at least read access to the parent directories - all the way up to root. It works, but some clients just get confused sometimes. Because SVN path-based-authorization is recursively applied, we don't want to give all users read access to root, because that would give them access to all source code in the repository. It would, however, be acceptable if users could get directory listings (just not actual lines of code) for the entire repository. This would prevent the svn clients from getting confused. Does any one know how to grant permissions to get directory listings without granting permissions to the actual contents of the files? Thanks!

    Read the article

  • Distributed version control systems merge easiness details

    - by Idsa
    I have just read Joel's blogpost concerning distributed version control systems and can't understand the main idea. He says that SVN thinks in terms of versions while Mercurial thinks in terms of changes. And, according to Joel, it solves merging problems. I heard this idea several times and still haven't conceived it. As I know, SVN's merging mechanism is based on changes (diffs) too. So what is the difference? I have no experience with distributed version control systems but I actively use SVN branching/merging and had no serious problems with it. Of course there are merging conflicts sometimes (when one piece of code was changed in both branches). But I see no way how this problem can be solved automatically by some kind of control version system.

    Read the article

  • Committing file deletions to svn repository whilst ignoring some other local mods

    - by TheJuice
    I have svn repository where I have scheduled some files and folders to be moved in the repository with svn mv. I also have some files that are peers of the files to be moved that have local modifications of which I only want a subset of those files to be committed along with the moves. e.g. the output of svn st would look like: D foo/bar D foo/bar/a.txt D foo/bar/b.txt M foo/exclude.txt M foo/include.txt A foo/whiz/bar A + foo/whiz/bar/c.txt A + foo/whiz/bar/d.txt To commit to the moves to the repository, I would need to perform the commit on foo but that would also commit the modifications to foo/exclude.txt and foo/include.txt. How would I commit only the deletions/additions as a result of the move plus the mods to foo/include.txt whilst excluding foo/exclude.txt? I have a feeling the answer lies with the --depth argument to svn ci but it's not clear to me how it will operate.

    Read the article

  • Reverting single file in SVN to a particular revision

    - by Gökhan Sever
    Hello, I have a file as shown below in an SVN repo that I would like to revert to a previous version. What is the way to do this in SVN? I want only downgrade this particular file to an older version, not the whole repo. Thanks. $ svn log myfile.py ---------------------- r179 | xx | 2010-05-10 Change 3 ---------------------- r175 | xx | 2010-05-08 Change 2 ---------------------- r174 | xx | 2010-05-04 Initial

    Read the article

  • how to add svn repository for an iphone application

    - by ratnasomu
    hellow all i am using svn for version control for an iphone application . i have created it from xcode repositories by giving url ,user name and password its authenticated .After that i have created a directory from there itself and have imported my project there. Then i have checked out to the local directory and have updated something in it. Click on commit changes. It done. After that i came to terminal to commit the project first time from terminal .There i have removed the build of the project then gave a command like "svn update". here i am getting error like svn: PROPFIND request failed on '/svn/pacman/GameDevelopment/Game'and 403 Forbidden error whts going wrong here? could any one help me in this ? Thanks..

    Read the article

  • where are the svn folders I checked in?

    - by johnny
    Trying to understand something. I created a d:\svn\repository on my server. I committed folders but when I go back to d:\svn\repository I do not see them. Are they all in a database? Will all my repositories go in that main folder and svn tracks them? What if I have two projects? Thank you.

    Read the article

  • Moving from SVN to HG : branching and backup

    - by rorycl
    My company runs svn right now and we are very familiar with it. However, because we do a lot of concurrent development, merging can become very complicated.. We've been playing with hg and we really like the ability to make fast and effective clones on a per-feature basis. We've got two main issues we'd like to resolve before we move to hg: Branches for erstwhile svn users I'm familiar with the "4 ways to branch in Mercurial" as set out in Steve Losh's article. We think we should "materialise" the branches because I think the dev team will find this the most straightforward way of migrating from svn. Consequently I guess we should follow the "branching with clones" model which means that separate clones for branches are made on the server. While this means that every clone/branch needs to be made on the server and published separately, this isn't too much of an issue for us as we are used to checking out svn branches which come down as separate copies. I'm worried, however, that merging changes and following history may become difficult between branches in this model. Backup If programmers in our team make local clones of a branch, how do they backup the local clone? We're used to seeing svn commit messages like this on a feature branch "Interim commit: db function not yet working". I can't see a way of doing this easily in hg. Advice gratefully received. Rory

    Read the article

  • Problem with svn copy command

    - by Gabriel Parenza
    Hi, Has anyone encountered something like this? I was expecting file.txt to be inside "testbranch/src/" folder after executing the command written command. But I get entry at "testbranch/src" to be a file type rather than directory type! In Web browser if I look under src folder of testbranch, it shows file contents of file.text. svn copy "https://repos/svn/myrepo/trunk/src/file.txt" "https://repos/svn/myrepo/branches/testbranch/src/" -m "Testing"

    Read the article

  • Two CVS projects into one SVN project

    - by komunca
    I have two CVS projects, which I maintain in Eclipse. I check out first project, and for second project I use "checkout in existing project" option, so I'm able to maintain two CVS projects into one Eclipse project. Doing this I'm able to Tag both projects with the same tag,etc. And know, time has come to start using SVN. I was able to create two separate CVS dump files, and when I used svnadmin to load then into SVN repository, I wasn't able to keep the structure I had in CVS! So, when i import both dump seperatly into SVN I get the following structure: ProjA - brancher tags trunk ProjB bracnches tags trunk In CVS I was able to have ProjB as a child folder of the ProjA trunk! Is there any way to implement this using SVN?

    Read the article

  • Remove unnecessary svn:mergeinfo properties

    - by LeonZandman
    When I merge stuff in my repository Subversion wants to add/change a lot of svn:mergeinfo properties to files that are totally unrelated to the things that I want to merge. Questions about this behaviour have been asked before here on Stackoverflow.com, as you can read here and here. From what I understand from the topics mentioned above it looks like a lot of files in my repository have explicit svn:mergeinfo properties on them, when they shouldn't. The advice is to reduce the amount and only put those properties on relevant files/folders. So now my question: how can I easily remove those unneeded properties? I'm using TortoiseSVN, but am reluctant to manually check/fix hundreds of files. Is there an easier way to remove those unnecessary svn:mergeinfo properties? P.S. I'm not looking for C++ SVN API code.

    Read the article

  • Problem doing SVN Vendor Branch - merge

    - by Gyan
    Hi, I am trying to use the svn vendor branch to upgrade the third party library. (We have modified the source code) I followed all the steps to create the vendor branch:: created the vendor branch for old version (3rd party library) created the vendor branch for latest version (3rd party library) copied the latest version to current folder using (usign svn_load_dirs.pl script) structure of vendor repository in svn URL/vendor/library/3.5.0 URL/vendor/library/3.7.0 URL/vendor/library/current I have the library-3.5.0 used/modified at URL/trunk/library/customized-library I have a problem when I try to merge the difference between URL/vendor/library/3.7.0 and URL/vendor/library/3.5.0 to URL/trunk/library/customized-library I am at the folder where URL/trunk/library/customized-library is checked out and I use following command to do the merge svn merge URL/vendor/library/3.5.0 URL/vendor/library/current . --accept PARAMETERS when I use theirs-conflict for accept parameter, It ignores all of my changes to the old version and copies files from 3.7.0 when I user mine-conflict, it ignores the files in 3.7.0 when I use postpone, it throws exception "tree conflict" Thanks Gyan

    Read the article

  • SVN: and bash: How to tell if there are uncommitted changes

    - by fishtoprecords
    I'm trying to wrap a standard sequence of steps in a shell script (linux/bash) and can't seem to figure out how to tell of the execution of svn status returned anything. For example ~/sandbox/$svn status ? pat/foo ~/sandbox/$echo $? 0 If I delete the foo file, then the svn status return nothing, but the echo $? is still 0 I want to not do some steps if there are uncommitted changes. Pointers greatly appreciated.

    Read the article

  • commit/update/merge commands in svn

    - by ajsie
    i want to know exactly when i should use either of commit, update and merge command in svn. after i've checked out a project and altered the code, should i use update, commit or merge to stay in sync? correct me if im wrong: update = all changes in the repo is copied to your local project. commit = all changes in your local project is copied to the repo. merge = same as above, but you determine the direction? when do i use each command above?

    Read the article

  • Can I set svn properties through ankhsvn?

    - by grungean
    I am using ankhsvn with VS2008. I am using a free repo hosting on the web. I am not using a svn client for this repo, but managing everything with ankhsvn (including adding solution file and project files to the new repo). I want to add the svn:needs-lock preperty to these files. I wonder if I can do this task using ankhsvn, or if I need to get another svn client for this purpose.

    Read the article

  • compare a directory of files with an svn revision

    - by JoelFan
    If I have a directory of files (with subdirectories) that is not under source control (no .svn directories), is there any way to compare it with a revision in svn (i.e. "svn diff")? Similar question: if I have a directory of files that is under source control, can I do a diff with to a different URL than the one it was checked out from?

    Read the article

  • Php/Shell remote SVN tarballs

    - by Tom J Nowell
    I'd like to set up daily tarballs/zip archives on my host for an SVN of a related project. I do not have access to their server, however they do have a publicly accessible SVN. How would I grab this SVN and build archives with minimal load ( dreamhost shared ), via Cron task + php/shell script?

    Read the article

  • git submodule svn external

    - by Jason
    Let's say I have 3 git repositories, each with a lib and tests folder in the root. All 3 repositories are part of what I want to be a single package, however it is important to me to keep the repositories separate. I am new to git coming from svn, so I have been reading up on submodules and how they differ from svn:externals. In SVN I could have a single lib/vendor/package directory, and inside package I could setup 3 externals pointing to each of my 3 repositories lib directory, renaming it appropriately like lib/vendor/package/a -> repo1/lib lib/vendor/package/b -> repo2/lib lib/vendor/package/c -> repo3/lib but from my understanding this is not possible with git. Am I missing something? Really I'm hoping this can be solved in one of two ways. Someone will point out how to create a 4th git repository which has the other 3 as submodules organized as I have mentioned above (where I can have an a, b, and c folder inside the root) Someone will point out how to set this up using svn:externals in combination with githubs svn support, referencing the lib directory within each git repository (from my understanding this is impossible)

    Read the article

  • A lot to merge after creating a new branch in SVN

    - by homaxto
    We have recently made a new branch, let us call it rel3.6, which was based on the last release named rel3.5. Work has started on rel3.6, and meanwhile some bugs has been fixed on rel3.5 which now is used for a service pack to be released soon. Today I wanted to merge those bugs from rel3.5 to rel3.6, so I fired up SmartSVN. Standing in the rel3.6 branch i chosed\ to merge with rel3.5 and selected to browse for a revision range. To my surprise there was a huge list of changes even though I checked "Stop on copy" and only showing mergeable revisions. Most of them where dated back before the creation of rel3.6. I did not expect to find anything from before rel3.5 was created. If I make a merge, the only thing I get are changes and conflicts to directory properties. Have I misunderstood something, or is it possible that something was done wrong when creating the branch?

    Read the article

  • SVN tags: How not to update/checkout them?

    - by Boldewyn
    In many projects, I check out the complete repository and have then the standard directory structure: project/ branches/ tags/ trunk/ If I do an svn up project, it's all fine with the branches and trunk folders, but, of course, the tags folder is updated, too, and filled with (mostly) lots of tagged versions that are of no value for my work and only occupy disk space. How can I except the tags folder from an svn update? Especially, how can I do this locally only, that is, without committing that back to the repository, as a solution with the svn:ignore keyword would do?

    Read the article

  • Is it safe to use a subversion feature branch after reintegrate-merged to trunk?

    - by ripper234
    Must a feature branch be deleted after it's merged (reintegrated) back to trunk? I prefer to constantly merge changes back and forth from my feature branch - I believe this keeps the conflicts to a minimum. Yet I understand that once you use the reintegrate merge to trunk, a feature branch should be deleted. Is it so? Why? What can I do to circumvent this? Update I'm asking about technical problems that come from the tool, not "methodology concerns". I intend to keep working on the feature branch after the merge. Update the top answer indeed specifies a rather complex procedure (merge, delete & rebranch). Is there an easy way to accomplish this in TortoiseSVN? Shouldn't there be?

    Read the article

  • SVN correct directory structure

    - by jax
    I followed this tutorial to setup SVN on my Fedora box http://www.ashishkulkarni.com/installing-subversion-on-fedora-linux/ It worked. However, there is no trunk, tags or branches when I set this up. In the tutorial he creates a sandbox project /svn/repos/sandbox Now I am assuming that all projects will go under repos /svn/repos/project1 /svn/repos/project2 When I view the project there are no trunk, tags or branches, I have not yet checked in any project, will these appear when I do that? As I understand all my files should go below the trunk. What are the tags and branches for? Just some clarification about the structure would be nice. Thanks.

    Read the article

  • Codeplex + SVN. How good is SVN bridge?

    - by aleemb
    I avoided CodePlex because of it's lack of support for proper SVN and was dissuaded by complaints about short comings. Recently, I have been wanting to port my project from beanstalk over to codeplex because the latter is more social. What problems have you encountered and how good is the support for SVN. How good is the SVN bridge?

    Read the article

< Previous Page | 16 17 18 19 20 21 22 23 24 25 26 27  | Next Page >