Search Results

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

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

  • 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

  • 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 merge on project / multiple files in VSS?

    - by Vijay
    I have VSS 6.0. I have branched my project so that I can do parallel development. I have 100s of files in folder/subfolders. I have changed some 10-20 files in multiple folders in ver 2 branch. Now I want to merge changes done in ver 2 to ver 1 branch. When I select the project merge branches option is not enabled. neither is it enabled when I select multiple files inside a folder. It's only enabled when one file is selected. Can I not merge on folder / multiple files in VSS 6.0. My thinking was when I do merge on project, VSS would pop up file names whenever there's a conflict (i.e files that are changed)

    Read the article

  • How to deal with files that are relevant to version control, but that frequently change in irrelevant ways?

    - by Jens Mühlenhoff
    .dproj files are essential for Delphi projects, so they have to be under version control. These files are controlled by the IDE and also contain some information that is frequently changed, but totally irrelevant for version control. For example: I change the start parameters of the application frequently (several times a day), but don't want to accidently commit the project file if only the part dealing with the start parameters has changed. So how to deal with this situation? A clean solution would be to take the file apart, but that isn't possible with the Delphi IDE AFAIK. Can you ignore a specific part of a file? We're using Subversion at the moment, but may migrate to Git soon.

    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

  • Version Control software (client server model)

    - by Amira Elsayed
    Hi All, I'm using windows 7 , and all what i want is to install Version Control server on one machine and let other developers to connect to it using the machine IP address and chekout, update and commit files I have tried VisualSVN and it works well for me , I also have tried to install Apache Server and try to configure it to run with subversion but I failed to do so , so if any one can help me I will appreciated Thanks in Advance Edit what I want if any one can suggest an alternative like VisualSVN that let me compare and choose from different options Thanks in Advance

    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

  • 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

  • Reconciling a new BindingList into a master BindingList using LINQ

    - by Neo
    I have a seemingly simple problem whereby I wish to reconcile two lists so that an 'old' master list is updated by a 'new' list containing updated elements. Elements are denoted by a key property. These are my requirements: All elements in either list that have the same key results in an assignment of that element from the 'new' list over the original element in the 'old' list only if any properties have changed. Any elements in the 'new' list that have keys not in the 'old' list will be added to the 'old' list. Any elements in the 'old' list that have keys not in the 'new' list will be removed from the 'old' list. I found an equivalent problem here - http://stackoverflow.com/questions/161432/ - but it hasn't really been answered properly. So, I came up with an algorithm to iterate through the old and new lists and perform the reconciliation as per the above. Before anyone asks why I'm not just replacing the old list object with the new list object in its entirety, it's for presentation purposes - this is a BindingList bound to a grid on a GUI and I need to prevent refresh artifacts such as blinking, scrollbars moving, etc. So the list object must remain the same, only its updated elements changed. Another thing to note is that the objects in the 'new' list, even if the key is the same and all the properties are the same, are completely different instances to the equivalent objects in the 'old' list, so copying references is not an option. Below is what I've come up with so far - it's a generic extension method for a BindingList. I've put comments in to demonstrate what I'm trying to do. public static class BindingListExtension { public static void Reconcile<T>(this BindingList<T> left, BindingList<T> right, string key) { PropertyInfo piKey = typeof(T).GetProperty(key); // Go through each item in the new list in order to find all updated and new elements foreach (T newObj in right) { // First, find an object in the new list that shares its key with an object in the old list T oldObj = left.First(call => piKey.GetValue(call, null).Equals(piKey.GetValue(newObj, null))); if (oldObj != null) { // An object in each list was found with the same key, so now check to see if any properties have changed and // if any have, then assign the object from the new list over the top of the equivalent element in the old list foreach (PropertyInfo pi in typeof(T).GetProperties()) { if (!pi.GetValue(oldObj, null).Equals(pi.GetValue(newObj, null))) { left[left.IndexOf(oldObj)] = newObj; break; } } } else { // The object in the new list is brand new (has a new key), so add it to the old list left.Add(newObj); } } // Now, go through each item in the old list to find all elements with keys no longer in the new list foreach (T oldObj in left) { // Look for an element in the new list with a key matching an element in the old list if (right.First(call => piKey.GetValue(call, null).Equals(piKey.GetValue(oldObj, null))) == null) { // A matching element cannot be found in the new list, so remove the item from the old list left.Remove(oldObj); } } } } It can be called like this: _oldBindingList.Reconcile(newBindingList, "MyKey") However, I'm looking for perhaps a method of doing the same using LINQ type methods such as GroupJoin<, Join<, Select<, SelectMany<, Intersect<, etc. So far, the problem I've had is that each of these LINQ type methods result in brand new intermediary lists (as a return value) and really, I only want to modify the existing list for all the above reasons. If anyone can help with this, would be most appreciated. If not, no worries, the above method (as it were) will suffice for now. Thanks, Jason

    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

  • 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

  • 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

  • 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

  • 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

  • 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

  • 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

  • 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

  • How do I integrate VisualSVN into Visual Studio 2010?

    - by Brandon
    I have an existing setup of Visual Studio 2008 with VisualSVN integrated into the IDE. I have installed and am testing out Visual Studio 2010. How do I integrate VisualSVN into 2010? Can I import my existing settings? I was issued a laptop with all of this setup for me but now we're gonna upgrade to 2010 soon.

    Read the article

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