Search Results

Search found 374 results on 15 pages for 'fossil scm'.

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 5/15 | < Previous Page | 1 2 3 4 5 6 7 8 9 10 11 12  | Next Page >

  • Merging two folders using git

    - by vrish88
    I'm working on a project with some people who have never used git before. Not knowing the capabilities of git, they created two version of the project: development and production. These two versions are both present in the current environment. To complicate things further, this other user created these folders in addition to the old development folder. So the project directory looks like this /root /proj (old dev folder with my own code in it) /dev_proj (new folder which I would like to merge /prod with) /prod_proj (production code) So what I'd like to do is merge the work that I've done in /proj with the work in the /dev_proj. Is there a way to do this with git? I've thought about creating a branch, copying all the files from /proj to /dev_proj and merging that branch with master. Would this work? Thanks and if I could clarify something let me know.

    Read the article

  • Using a single visual studio 2005 solution with multiple source control applications

    - by Bas Bossink
    In my recent SO question I was helped tremendously in using git as a front-end to ClearCase. However actually trying the suggested answer(s) led to further complications. Visual Studio keeps a reference to the used source control provider in both the .sln as well as the .csproj files. I tried resolving this issue by keeping a modified copy of the .sln with the source control provider paragraph removed but this did not help since each project also has some source control provider information. I don't want to keep private copies of all the projects since this would be a maintenance nightmare. Do any of you have suggestions on how to resolve this issue?

    Read the article

  • maven-release-plugin: Perform fails with 'working directory "...workspace\target\checkout\workspace"

    - by Ed
    Hi, I have maven project that fails when release:perform is called, though release;prepare works as expected. I have found the bug report (below) which certainly seems to resemble the issue I have but not entirely sure I understand the problem: MRELEASE516 The last few lines of output I get: [INFO] Executing: cmd.exe /X /C "p4 -d E:\hudson\jobs\myHudsonJob\workspace\target\checkout -p 10.20.0.38:1666 client -d myProjectWorkspace-MavenSCM-E:\hudson\jobs\myHudsonJob\workspace\target\checkout" [INFO] Executing goals 'deploy'... [WARNING] Base directory is a file. Using base directory as POM location. [WARNING] Maven will be executed in interactive mode, but no input stream has been configured for this MavenInvoker instance. [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Error executing Maven. Working directory "E:\hudson\jobs\myHudsonJob\workspace\target\checkout\workspace" does not exist! From reading the bug report the possible cause of the error is related to my modules' structure, I've tried to outline it below: /workspace | |+ pom.xml (root pom whose parent is the build pom, | calling release:perform on this pom) | [Modules: moduleA and moduleB] | |- moduleA |+ pom.xml (parent is also build pom) |+ build/pom.xml (the build pom - no custom parent) |- moduleB |+ pom.xml (parent is build pom) It seems that the root pom should be in some common directory inside 'workspace' from the error but tried that and doesn't work, nor make sense as to why I need it. What does the warning Base directory is a file want me to do instead?! It then figures that the base directory is workspace which then means the working directory is not found...any ideas? Thanks in advance.

    Read the article

  • Git init - .git: Permission Denied

    - by Gcoop
    Hi All, I am trying to initiate git on my remote server using ssh. When I run git init On the server in a folder I have write permissions to I get the following error. .git: Permission denied Do I need to assign any other permissions on that folder to be able to create the repository? Thanks

    Read the article

  • Maintaining Project with Git

    - by gkrdvl
    Hi All, I have 2 project, and actually these 2 project is about 80% same each other, the mainly difference is just about language and business model, one is for larger audience using english language and have a 9$/month business model, another is using local language with freemium business model. Sometime when I want to add new feature/functionality, I want to add it in both of the project, but also sometime I want to add feature especially just for the local project. My question is, how do I maintain these 2 project with git ? Maintain 2 git repository for each project or Maintain single git repository with 2 mainly branch or Any other suggestion ?

    Read the article

  • git reference common directory/repo

    - by phillee
    Project layout: /project_a /shared /project_b /shared /shared project_a and project_b both need to contain the shared folder. With svn, we used svn:externalsand that worked fine, since svn can reference subdirs (with relative paths too). However, we moved to git and it seems to not support checking out subdirs. Our solution now is to put project_a, project_b and shared all in different git repos, and use git submodules in project_a and project_b. However this seems much more complicated than one monolithic svn repo with svn:externals. What's the correct way to handle common elements in git?

    Read the article

  • How to export all changed/added files from Git?

    - by dr Hannibal Lecter
    Hi all! I am very new to Git and I have a slight problem. In SVN [this feels like an Only Fools and Horses story by uncle Albert.."during the war..."] when I wanted to update a production site with my latest changes, I'd do a diff in TSVN and export all the changed/added files between two revisions. As you can imagine, it was easy to get those files to a production site afterwards. However, it seems like I'm unable to find an "export changed files" option in Git. I can do a diff and see the changes, I can get a list of files, but I can't actually export them. Is there a reasonable way to do this? Am I missing something simple? Just to clarify once again, I need to export all the changes between two specific commits. Thanks in advance!

    Read the article

  • Protect files from svn commit.

    - by chrsk
    Hey, imagine a plain webapp with a log4j.properties which is under version control. I can't add it to svn:ignore because its a mandatory file. If i make custom changes for development and i don't want to commit them, i have to watch out for accidently commits. For one file it's easy to handle, with 3 or more files it becomes creepy. Is there a way to disable these files temporary from svn commit? So its easiert to commit? I'm working with svn and subclipse.

    Read the article

  • How to add iphone libs *.a files to xCode's SVN (CSM)?

    - by slatvick
    Have: xCode project with Google Analytics lib, could be normally compiled. Want just to put it to already working SVN to build project from the work macosx without any additional steps. I've tried different ways to add *.a file to the svn, but all just have not worked. When adding a directory there is all files except *.a in the svn. I bet there is not such problem with 3d party SVN clients, but want to give the xCode one more chance, so asking there. Guys, is it possible to add *.a files to SVN using xCode?

    Read the article

  • Using version control with SSIS packages (saving 'sensitive' data)

    - by sandesh247
    Hi. We are a team working on a bunch of SSIS packages, which we share using version control (SVN). We have three ways of saving sensitive data in these packages : not storing them at all storing them with a user key storing them with a password However, each of these options is inconvenient while testing packages saved and committed by an other developer. For each such package, one has to update the credentials, no matter how the sensitive data was persisted. Is there a better way to collaborate on SSIS packages?

    Read the article

  • mercurial hg - pushing to a cloned repositor via APACHE errors with "repository is unrelated"

    - by Ash
    Two scenarios, one work one doesn't when they both should: Scenario #1: (DOES NOT work via apache) 2 repos on Server SERVER: Repo "A", Repo "B" cloned from repo A via http://SERVER/HG/A On client: Repo A cloned from http://SERVER/HG/A Repo B cloned from http://SERVER/HG/B Added a file to repo A from client and commited & pushed it up to http://SERVER/HG/A ...WORKS Added a file to repo B from client and commited & pushed it up to http://SERVER/HG/B ...ERROR with abort: repository is unrelated, it only works if I -f (force) the push Scenario #2: (works via file system) On Server SERVER: Repo "A", Repo "B" cloned from E:/HG/A On client: Repo A cloned from E:/HG/A Repo B cloned from E:/HG/B Added a file to repo A from client and commited & pushed it up to E:/HG/A ...WORKS Added a file to repo B from client and commited & pushed it up to E:/HG/B ...WORKS Conclusion:...Something in the apache configuration or in the integration between apache & mercurial is making the repo "unrelated".... Any ideas??? Why do I need to force in the first scenario but do not have to in the second?? ...and i tried both scenarios via tortoisehg as well as command line.

    Read the article

  • Are there any good graphical git and hg/Mercurial clients on Mac OS X?

    - by DASKAjA
    I'm searching for compelling git and Mercurial clients on Mac OS X. The most clients I've found so far were less compelling as I expected. Some of the clients are programmed even in ruby or tcl/tk, which IMO aren't good OSX citizens in regard of integration in the OS. I've clients in mind similar to Versions.app or Cornetstone which are subversion-only clients. Perhaps somebody got an insider tip for me.

    Read the article

  • mercurial for OS projects and svn for Enterprise projects?

    - by ajsie
    correct me if im wrong, but isn't distributed SCMs for OS projects while centralized SCMs are better for corporate/private projects? cause with eg. mercurial anyone gets an exact copy of the repository with FULL history features, while with centralized you only get the latest working copy. im more focused on private projects so i wonder if its better with centralized SCMs or doesnt it matter?

    Read the article

  • What default targets do you have in your typical ant buildfile?

    - by altern
    Do you have some predefined set of targets which all build.xml files you create contain? For example, a lot of ant manuals suggest the following list of targets: init clean compile build jar test javadoc dist deploy webapp What is the most large build file you met in your life? How many targets did it have and what are they? How often do you need more than predefined set of targets? The goal is to develop some conventions to have standard buildfile template for any project having the notion of the maven-like approach in mind (when a lot of work happens under the cover, convention over configuration). Also it would be great if you know the place where one can find collection of different buildfiles to choose or to get inspired from.

    Read the article

  • clearcase option for view movement from one host path to another

    - by wrapperm
    Hi all, I have created a clearcase dynamic view for my development by name "view1". I have mistakenly selected the view storage location as a local PC in my network, that was made sharable by the PC owner. I was suppose to select the view storage location to be a server. Now, the issue is that I have done lot of development with the view that I have created and have plenty of view DO's and view private files in it. So I'm ruling out the option of deleting the view from the PC local storage (host path) and then creating another view in the server with the same config spec. Please, let me know if there is any method of editing the view properties (or doing something else) by which I could be able to move the view to the server (with all the DO's and view private files retained) Thanks in advance, Rahamath

    Read the article

  • How do I add a folder/group to SCM (CVS) in Xcode?

    - by Brad
    I have an iPhone project in Xcode which is checked into CVS via XCode's SCM support. I have created a new folder in this project, and created a group for it's files. However, the files in this group/folder are not in CVS, and I cannot figure out how to get them in there. The usual "Add to repository" under the "SCM" menu is always grayed-out when I try to select one of the files - I would assume this is because the folder is not in CVS. How do I add the folder/files to CVS?

    Read the article

  • Listen to all Perforce commands made by my client machine to server

    - by Ed
    Hi, Is it possible to somehow listen to all perforce cammands issued from my machine to the perforce server? I did some googling yesterday and found a page somewhere about a perforce proxy or broker that would intercept perforce commands and allow you to do what you wanted with them before sending them to the server...and now can't find the page! I am trying to debug our build process (built using Maven) that is failing while running the maven-release-plugin (prepare). Cheers.

    Read the article

  • Parallel Dev: Should developers work within the same branch?

    - by Zombies
    Should multiple developers work within the same branch, and update - modify - commit ? Or should each developer have his/her own each branch exclusively? And how would sharing branches impact an environment where you are doing routine maintenance as opposed to unmaintained code streams? Also, how would this work if you deploy each developers work as soon as it is done and passes testing (rapidly, as opposed to putting all of their work into a single release).

    Read the article

  • Git - Committing Machine Specific Configuration Files

    - by Gordon
    A common scenario when I develop is that the codebase will have several config files which require machine specific settings. These files will be checked into Git and other developers will always accidentally check them back in and break someone else's configuration. A simple solution to this would be to just not check them in to Git, or even to additionally add a .gitignore entry for them. However, I find that it is much more elegant to have some sensible defaults in the file which the developer can modify to suit his needs. Is there an elegant way to make Git play nicely with such files? I would like to be able to modify a machine-specific configuration file and then be able to run "git commit -a" without checking that file in.

    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 | 1 2 3 4 5 6 7 8 9 10 11 12  | Next Page >