Search Results

Search found 37875 results on 1515 pages for 'version space'.

Page 115/1515 | < Previous Page | 111 112 113 114 115 116 117 118 119 120 121 122  | Next Page >

  • What am I doing wrong with SVN merging?

    - by randomusername
    When SVN with merge tracking works, it's really nice, I love it. But it keeps getting twisted up. We are using TortoiseSVN. We continuously get the following message: Error: Reintegrate can only be used if revisions 1234 through 2345 were previously merged from /Trunk to the reintegrate source, but this is not the case For reference, this is the method we are using: Create a Branch Develop in the branch Occasionally Merge a range of revisions from the Trunk to the Branch When branch is stable, Reintegrate a branch from the branch to the trunk Delete the branch I Merge a range of revisions from the trunk to the branch (leaving the range blank, so it should be all revisions) just prior to the reintegrate operation, so the branch should be properly synced with the trunk. Right now, the Trunk has multiple SVN merge tracking properties associated with it. Should it? Or should a Reintegrate not add any merge tracking info? Is there something wrong with our process? This is making SVN unusable - 1 out of every 3 reintegrates forces me to dive in and hack at the merge tracking info.

    Read the article

  • TFS: comparing changesets

    - by Ram
    In TFS we can find "compare" a file between 2 changesets. Is it possible to compare 2 changesets. Say take changeset "r" as reference and compare it with changeset "s" and find the files/folders which were added/removed/delted/edited ?

    Read the article

  • How to properly manage a complex DB structure?

    - by errr
    Let's say you have several systems using the same DB - each uses several schemes (sometimes same as the other). This structure of these schemes is somewhat very big and complicated. Now, how could you possibly manage such scheme structure? Obviously using some sort of "configuration" - the simplest would be SQL scripts, but a more reasonable solution would be XMLs which can be easily converted into SQL, or some other readable solution (for example, JPA's XMLs or Annotations). This solution though, causes a problem where you can't really tell if your configuration matches the structure of the DB schemes exactly. You can't say if those two are synchronized. Why wouldn't they? Well, in such big structure there are going to be many changes, and you won't always remember to save/commit your configuration after you've altered the schemes, or maybe you did save/commit it, but eventually didn't altered anything in the schemes and forgot to undo the changes to the configuration. More than that, another problem (not caused by the configuration, but isn't addressed by it either) is versioning. I don't see any good way of managing the DB schemes versions (say our last alteration makes 3 systems crash - not good, how to "rollback"?). And thoughts? thx.

    Read the article

  • Looking for a source code management system with a good GUI client

    - by Anders Öhrt
    We are currently using CS-RCS Pro for source code management, and are looking for to replace this due to performance issues. It is based on client side file access with no own protocol, which makes it painfully slow to use over a slow VPN line since it always rewrites the whole history of a file. It does however have a GUI client which is very simple and gives a great overview. We have three main requirements in a SCM: Fast. It must have a server side service or some other smart way so working with files with a large history is fast. A good Windows GUI client (not Explorer shell integration, not VS or Eclipse IDE integration), so working with files and branches is easy. The possibility to have several branches checked out at once in different directories. Does anyone have a recommendation of a SCM which fulfills there requirements?

    Read the article

  • Has anyone tried vss2git?

    - by Radicalise
    OK, so I have started a contract where they are using (gulp) Visual SourceSafe and are looking to move to something better. I have recommended Git. I stumbled across vss2git, which looks useful for migrating from VSS. Has anyone used it? Many thanks!

    Read the article

  • subversioning ipad app project

    - by MistakesRInevitable
    Hi All, I am currently looking at setting up an Ipad app project into subversion. Ive had a lot of experience with windows based development and .net. With this we have just created a repository in a network folder (by just right clicking - TortiseSVN - create repository) , than all we have done is our developers have checked out from this directory. How do we go about doing this in xcode. I know subversion is integrated with xcode and I am pretty confident of doing everything (from tutorials) except for the creation of the repository. Just wondering how we go about creating a repository in a folder based up on network folder? Thanks in advance

    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

  • Subversion: Oops! Any way to move / to /trunk?

    - by Metaphile
    I made the mistake of creating a Subversion repository without the usual trunk, branches, and tags directories. That is, the root directory of the project maps to the root directory of the repository. Now I want to create a feature branch, but there's no good place to put it. What I'd like to do is move / to /trunk, preserving its properties and history. Am I out of luck?

    Read the article

  • git + partly shared files between branches/repositories. Is it possible?

    - by Maxym
    One team in company I work for has the following problem. They develop an application, which will have different builds (e.g. different design depending on customer). so they have some code shared between builds, and some specific to build. E.g. first build has (example is meaningless about files, it is just to understand the problem; I don't know exactly which code differs) /src/class1.java /src/class2.java /res/image1.png /res/image2.png second project contains /src/class1.java /src/class3.java /res/image1.png /res/image3.png as you see, both have class1.java and image1.png. Evething else is different. The project is much more complex of course, so to contain everything in one project is not comfortable... But also to make different branches and commit the same code to all of them is not comfortable... probably I picked wrong direction thinking about this problem, but I just took a look at git (we use svn), and it allows separated repositories. The question is: is it possible to make different branches in git, but tell it that "these files should be shared between them" and other files should be only in those branches. Then when developer commits class1.java git synchronizes it in all branches/repositorias etc. Maybe there is another solution which can be easy taken?

    Read the article

  • Converting a company from SVN to Hg?

    - by Michael
    We're a heavy user of SVN here. While the advantages of GIT over SVN made us want to change, the advantages of Hg over SVN mean it's now time to change and we need to start doing so very soon. I'm not so worried on the client side, but here are my questions. There are some excellent books on setting file metaproperties, properly organizing projects, etc on SVN. What is that book(s) for Hg? Is there a way to convert an SVN repository (that you've used) and can report how well it went? We don't want to lose years of commit logs if possible. When you DO convert, how did you split up the old code? Did you commit trunk as one project, and tags/forks as another? If you used SVN for legacy work, did you check in updates to SVN or something else?

    Read the article

  • Subversion Proxy for working offline?

    - by Mauli
    What is the best approach for working at a customers site (with several people) where there maybe not internet access the whole time and using a subversion repository? (Migrating to Git or Mecurial is out of the question at the moment) But wouldn't it be possible to leverage something like, for instance the Git SVN Integration, to create a proxy which acts like a subversion repository for the clients and may be used at the end to synchronize the changes back to subversion? Is there already something like that available?

    Read the article

  • remove the spaces...

    - by tekknolagi
    !/usr/bin/python import random lower_a = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'] upper_a = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'] num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] all = [] all = " ".join("".join(lower_a) + "".join(upper_a) + "".join(num)) all = all.split() x = 0 while x < 10: for i in range(7): a = random.choice(all) print a, print x += 1 what i want to do is remove the spaces from the output what it gives now is Z 3 a A I K R G B i N 9 c E v g E r A N 8 e B 6 d v H O c a V 8 c x y b g 2 W a T T f 8 H T r 6 E p D K l 5 p u x q 8 P Z 9 T n I W X n B Q

    Read the article

  • What is the worst source control you have used? [closed]

    - by David Liddle
    There are many discussions about what people's favourite source control is (subversion, mercurial ...). But what source control systems have you used that you certainly wouldn't recommend? And more beneficial, how would you go about promoting change in the business to a new source control system? A few years ago I developed using a source control system called Synergy. There were two Synergy experts in the company that constantly had to help the developers do check-ins/outs and merges were especially difficult. What would be your steps of migrating to a better source control. Would you host everything internally or pay for services such as github?

    Read the article

  • How do you store third party libraries in your source control?

    - by ajma
    How do you store third party libraries that you use in your project in your source control? When would you store binaries in your source control? When would you store the code in your source control? Would you ever store both? In what situations would you do this? (Btw, I'm using .NET but it doesn't really matter for this question)

    Read the article

  • The way to deploy from repos in svn

    - by fatnjazzy
    Hi, we are 5 developers working in an svn environment. every programmer can work on small bugs and commit whenever he wants. after the work has done, i want to give them the way to deploy to the production without considering the other programmers and their deployment. for example: while i am committing, other user is committing too but he did not finish to commit. his revisions 1,3 my revisions 2,4 if i will deploy the HEAD(4), ill also deploy his work. and i will deploy 2 and 4 i will include his files as well. how can i free every programmer to deploy his files only? Thanks

    Read the article

  • SVN: change a past revision and have the change in current

    - by John Isaacks
    ok say I am on revision 4. I check it out, make some change and commit it. I am not on revision 5. I check it out again, am making some changes, but I am informed that there was a typo from revision 5 that needs to be changed right away. I don't want to fix it in my current working copy because I am in the middle of something and it wont be ready to commit yet. But I don't want to revert back to revision 5 and loose all my work. what I want to do is go back to revision 5, make the small change, commit it. And ALSO have that change made to my current working copy as well. I hope that makes sense. Is there a way to do that?

    Read the article

  • Is there a Mercurial equivalent to gitosis?

    - by fedesilva
    I've used ( and still use ) mercurial and git. I have some repos hosted in a server with gitosis which is great and easy to setup. I am looking for a similar tool for hosting mercurial repos. It must provide minimal acl and ssh access and allow for remote config ( in the style of gitosis's "clone the admin repo and push changes" ). Extra points for automating hgweb config via said tool.

    Read the article

  • How to do simultaneous builds in two Git branches?

    - by james creasy
    I've looked at git-new-workdir, but I don't want the history to be shared because the branches have a release-main relationship. That is, changes in the release branch I want to propagate to the main line, but changes in the main line I don't want in the release line. A common pattern for me is to fix a bug in the release line, integrate it to the main line, then start builds in both branches at the same time. Is there a way to do this with git-new-workdir, do I need to clone, or is there a better solution? Thanks

    Read the article

< Previous Page | 111 112 113 114 115 116 117 118 119 120 121 122  | Next Page >