Search Results

Search found 4995 results on 200 pages for 'svn merge reintegrate'.

Page 91/200 | < Previous Page | 87 88 89 90 91 92 93 94 95 96 97 98  | Next Page >

• Which is a better source control with NetBeans (Ruby on Rails), VSS or Subversion?

  - by Tushar Maru

  Which is better source control with NetBeans (Ruby on Rails), VSS or subversion? I want to use source control, so I want to know which is better for NetBeans (RoR). Visual Source safe or Subversion?

  Read the article

• Help me understand WebDAV and Autoversioning

  - by Malfist

  I just read the WebDAV Appendex in the O'Reilly Subversion book. I don't quite understand it. It talked about users being able to "mount" WebDAV directories (trees) and manipulate the files like they would normally and on saves the server would automagically create a new revision. The way it explained it, it sounded like it would work for any program, but then at the end of the appendix, it listed a series of programs that worked with WebDAV servers, which leads me to think that maybe it doesn't work like it originally described it. My question is this: How exactly do you interact with a WebDAV repository? Can I do this for example: Copy a file locally via ftp, edit it with notepad++, and then upload it via ftp to the server and have the server do a commit and create a new revision with the file I just edited and uploaded. Also, if that is possible, what happens if two people edit the file locally (on their machines) and uploaded two reversions to the server? With webDAV will I be able to replace Dreamweaver's "Oops, someone edited this before you" with simple ftp uploads and subversion conflict resolutions?

  Read the article

• Having trouble with post-commit hook

  - by John Isaacks

  I am following this tutorial that is like the hello world for post-commit I am using unbuntu 10.04. I installed svnnotify and ran $ which svnnotify which output: /usr/bin/svnnotify so I changed the path in the turorial from /usr/local/bin/svnnotify to /usr/bin/svnnotify I also tried changing the line: #!/bin/sh to #!/bin/bash since bash is the login shell in ubuntu 10.04. I tried to run it the way the tutorial originally had it, with my changes, and combinations of the two. Everytime the commit is successful but I get Warning: post-commit hook failed (exit code 1) with no output. The original way had output not found I am very new to linux and shell scripting and have exhausted everything I can think of. What am I doing wrong?

  Read the article

• How to inject "history" into a subversion repository?

  - by Ran Biron

  We're migrating from StarTeam (aka "the horrible") to SubVersion (aka "the alleged great"). We've already migrated the files by doing a "dumb" commit to all files and started working on the SubVersion repository. However, we're still forced to use StarTeam because we lack the per-file history of check-ins. Is it possible to inject that history into SubVersion after the first check-in has been done? If yes - how?

  Read the article

• How to rebase one Git repository onto another one?

  - by kroimon

  Hi there! I had one Git repository (A) which contains the development of a project until a certain point. Then I lost the USB stick this repo A was on. Luckily I had a backup of the latest commit, so I could create a new repository (B) later where I imported the latest project's state and continue development. Now I recovered that lost USB stick, so I have two Git repositories. I think I just have to rebase repo B onto repo A somehow, but I have no idea how to do that, maybe using fetch/pull and rebase? Thanks in advance for your help!

  Read the article

• Tool to migrate a repo with only read access?

  - by Corazu

  I have a subversion repository located on our school servers from a project my friends and I worked on the past semester. We want to take the project and polish it and make it more of a portfolio item and I'm not quite sure that the repo will stay intact on the school servers (they usually wipe it after a few semesters). I don't have access to dump the repo, although I've sent an email to see if I can get one - which would be the best solution. I tried svnsync but the school server doesn't support the replay command (probably turned off), so that won't work for me. Now, theoretically, wouldn't it be possible to (manually or programmatically) checkout each revision of the repository and check it in to a new repository on our own server? I think it would work - there's only 3 of us, and there's no working copy conflicts that we'd have to worry about, just want a copy of all the history in the repo in case we need to go back and look at it. That being said, before I go and reinvent a wheel by writing a script to do it - does something like this already exist? I have to figure there's already a tool to do it, or that someone has wrote a script to do it.

  Read the article

• FileMerge: This file type cannot be merged.

  - by porneL

  FileMerge.app fails with an odd message: This file type cannot be merged. when I try to save successfully merged text files, which definitely can be merged. (I invoke FileMerge from git using opendiff tool on OS X 10.6.3) Why is it happening? How can I avoid this problem?

  Read the article

• How to activate revision info in line number view

  - by Joshua

  I know of an Eclipse feature to show revision information (gradual coloring, more info like revisionnumber, date and author on mouseover) for the last changes in a line in the linenumbers-view. Does anyone know how to activate this feature for a file, or even better, by default? I accidently hit some shortcut lately which made it show in one file, it does not show up in the others, though.

  Read the article

• How do I fix JavaHL (JNI) Not available after I have changed the logon password on my Mac?

  - by INeedHelp

  I have installed Eclipse 3.5.2 and the plugin Subversion JavaHL Native Library Adapter 1.6.9.2 and this worked without any problems. However, this morning I was forced to change the password to logon to my Mac and since then I get the message that "Subversion native library not available" when I try to save any changes. Can anyone help? I have tried to add this line (-Djava.library.path=/usr/lib/jni) to the eclipse.ini file but this didn´t seem to make any difference. Can anyone help?

  Read the article

• Include revision or tag name on website pages (ASP.NET) when deploying with CruiseControl.net and su

  - by Greg

  Is it possible to include the revision number or the name of the tag used for a build on an ASP.NET website when deploying with CruiseControl.net and subversion?

  Read the article

• Is there any way to get the combine two xml into one xml in Linux.

  - by Tattat

  XML one is something like that: <dict> <key>2</key> <array> <string>A</string> <string>B</string> </array> <key>3</key> <array> <string>C</string> <string>D</string> <string>E</string> </array> </dict> XML Two is something like that: <dict> <key>A</key> <array> <string>A1</string> <false/> <false/> <array> <string>Apple</string> <string>This is an apple</string> </array> <array> <string>Apple Pie</string> <string>I love Apple Pie.</string> </array> </array> <key>B</key> <array> <string>B7</string> <false/> <false/> <array> <string>Boy</string> <string>I am a boy.</string> </array> </array> </dict> I want to convert to this: <dict> <key>2</key> <array> <string>A, Apple, Apple Pie</string> <string>B, Boy</string> </array> ... </dict>

  Read the article

• How can a C++ windows dll be merged into a C# application exe?

  - by Noah

  I have a Windows C# program that uses a C++ dll for data i/o. My goal is to deploy the application as a single EXE. What are the steps to create such an executable?

  Read the article

• Will using a VCS help me as a web dev?

  - by jsims281

  I'm thinking of trying a VCS such as subversion, to manage my next project, but I'm not sure if will offer any real benefits for me as a web developer. As I understand it, one of the major benefits of a VCS is that a group of people can work on a project at once. Reading material on the subject seems pretty one sided: "Using a version control system is an absolute must for a developer of a project above a few hundred lines of code" ...and I've got a feeling it could become a chore, with not many benefits. I work on development server on the local network, so any amount of people can work on the files already. If anyone needs to get in remotely, they use FTP. What would a modern version control system give me on top of this?

  Read the article

• Git Clone from SSH Repository

  - by Mike Silvis

  I used to be able to clone from my personal git repository but now i seem to be running into an error. user:dev.site.com mikesilvis$ git clone { my ssh directory } server@ipaddress's password: remote: Counting objects: 3622, done. remote: Compressing objects: 100% (2718/2718), done. error: git upload-pack: git-pack-objects died with error. fatal: git upload-pack: aborting due to possible repository corruption on the remote side. remote: aborting due to possible repository corruption on the remote side. fatal: early EOF fatal: index-pack failed It seems to be working however while I push files to the repository.

  Read the article

• Record a copy or move that has already occurred using Subversion

  - by Matt Joiner

  Mercurial provides a -A, --after option for moves and copies, which records those operations after they've already occurred. How can I achieve this using Subversion?

  Read the article

• Subversion and Windows Server 2008

  - by Frozzare

  Hello. I install the subversion on my windows server 2008. But it's only work localhost. It don't work when i try from another computer. I can't find out whats the problem is. Are there any ports or something like that i need to configure? This was the guide i follow Thaks for your help

  Read the article

• Accessing Subversion commit data externally

  - by gaoshan88

  I have need to access subversion data (commit messages, files updated, revision numbers, dates modified, author, etc.) externally. Is this something for some sort of subversion hook or is there a decent third party package for this or some other "best practice" way to approach accessing subversion data externally (and by external I mean from a php/ruby or python script... external to subversion itself)?

  Read the article

• svnant: How to checkout specified URLs from a repository?

  - by Mike

  Hi all: i'm using SVNant to checkout a repository, the total repository content is so large and i'm only interest in a few file and directories, the repository structure as below: project folder1 folder2 largefolder largefile1 largefile2 folder3 fileilike1.txt fileilike2.txt file.txt file2.txt etc... i'm only interest in the files under project/ folder such as file.txt and file2.txt, and also all files under folder3. i do not want to checkout largefolder/ because it has extra-large files in it. how to write the svnant script? i use ignore but seems not work.

  Read the article

• TeamCity build triggers don't automatically run

  - by Phil.Wheeler

  I've been playing around with and learning a bit about TeamCity and have the server correctly set up with my .Net MVC project committed in Subversion successfully and build configurations and triggers sorted to kick off when any changes are committed to the repository. TeamCity polls on its default time period and is picking up that changes have been committed, but it is adding these to the queue without actually ever running them. I have to manually click the "Run" button to kick them off. What setting do I need to change in order to ensure that any new changes are automatically run?

  Read the article

• Virus in Subversion repository, what to do?

  - by furtelwart

  Imagine the following situation: A virus infected file was commited into a Subversion repository. A Anti Virus scanner runs on the server and also scans the Subversion repository. The Anti Virus scanner will delete the affected revision or move it to quarantine. The consequence is a broken repository. If the revision file is recoverable (from quarantine), how to solve this problem? I have some goals to achieve: The AV is not allowed to be disabled or excluded from the directories. The virus infected file must not be stored in the repository The repository must be consistens and usable. What is the nicest solution for this little problem?

  Read the article

• Mixing repositories in tortoise

  - by Martin

  Will tortoise let me mix repositories in the same and if so how? What I would like is to store code, configs and binaries in sererate repositories.

  Read the article

• how can I see the repository path of a local copy?

  - by davka

  this is probably close to trivial, but I can't find it: how can I see where in the repository a local copy refers to? say, I have a workspace checked out come time ago, I want to see if it was checked out from a branch or the trunk. thanks!

  Read the article

• Is there a way to include a file in Source Control if it's within an "excluded" pattern? (include my

  - by Clay Nichols

  I'm using the latest TortoiseSVN and I've got *.exe in the global exclusion. But I now find that there are a couple of .exe files that I would like to check in. Any way to do that?

  Read the article

• SVN Export in Eclipse removes labels on tabs

  - by Sorcy

  I have a very strange effect when using subclipse with eclipse. Whenever I use Team-Export to export a file from the editor the export works fine, but the label of the tab of the file is removed. Effect can be seen here: http://www.daspferd.de/img/tabs.png Strangely enough it happens with php-files, css-files, html-files but NOT with javascript-files. So I'm assuming it's some kind of setting that I haven't found yet and not a bug in subclipse. Anyone know where I can shut down this behaviour?

  Read the article

• Subversion branch question

  - by aspdotnetuser

  Hi, If you have created a branch and are working with the files in that branch, when you 'update' it, is it updating/merging the code in the branch with the code in the trunk? Also, when you have commited your changes to the branch, how do you update the trunk with your changes? (since you commit the changes and have to switch to the trunk again?) Any comments will be appreciated :) Thanks,

  Read the article

< Previous Page | 87 88 89 90 91 92 93 94 95 96 97 98  | Next Page >