Search Results

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

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

  • Select statement that combines similar rows with certain ids?

    - by vegatron
    hi I have a warehouse_products table which defines how many products in the warehouses so lets say I have 20 records/rows in the table, some rows may contain the same product id but in a different warehouse I need to create select statement that give every product one row, and in this row I must have the quantity in warehouse A and warehouse B .. so in the end I will get for example 10 rows that contain all the data

    Read the article

  • Get the tags of a document in Subversion

    - by Onno
    I was wondering if there is a way to easily see the tags of a specific file in Subversion using the command line and/or TortoiseSVN. Most version control system allow you to see easily access the tags/labels of a file. When using TortoiseSVN I can do this when I access the "Revision Graph". This however is a operation that takes around 44 minutes. I consider this very hard work just to know what tags have been created for the file. Is there another way to do it? Or is there no way to instantaneously access tag information. Thanks, Onno

    Read the article

  • Why is git better than Subversion?

    - by Ben Mills
    I've been using Subversion for a few years and after using SourceSafe, I just love Subversion. Combined with TortoiseSVN, I can't really imagine how it could be any better. Yet there's a growing number of developers claiming that Subversion has problems and that we should be moving to the new breed of distributed version control systems, such as Git. Can anyone explain how Git improves upon Subversion?

    Read the article

  • Where to find prebuilt binaries for subversion 1.6 for Ubuntu (or Debian)?

    - by Andrea Francia
    While I can easily find the binaries for the latest version of subversion (1.6) I can't find the binaries for Ubuntu (or Debian). The download page at tigris.org suggest to use the command: apt-get install subversion but as you can experience this will install up to the version 1.5.4 (at the time of writing May 6, 2009). This isn't a nice thing because many working copies that I share with Windows are automatically updated to 1.6 by TortoiseSVN.

    Read the article

  • I am getting an error trying to checkout a directory from svn

    - by oo
    I only get this error on one machine and its only on one directory when trying to check out some source code: Server sent unexpected return value (502 Bad Gateway) in response to OPTIONS other folks can download it fine. any ideas whats going on. I just uploaded to version 1.6.7 to see if it was a versioning issue but still see the error above.

    Read the article

  • How can I save a commit in Subversion?

    - by Mnementh
    If I'm not online, I sometimes want to package some changes to a commit, that is saved in the working copy and can be really committed to the repository once I back online. How can I do that with Subversion (possible with the help of additional tools).

    Read the article

  • Eclipse+Subversive- Multiple src paths in a single project each from a separate parts of a single re

    - by guinaut
    In a nutshell, I would like to have a single eclipse project with multiple src directories each managed by subversive (or subclipse). If the code base were small, I would use several projects. However, the code base is not small (50+ src paths). Does anyone know how to do this with the Subversion plugins for eclipse? All of the src paths derive from modules that in turn have a common point node in the repository. However, the modules are versioned, so I can’t checkout all of them. It looks as though Subclipse and Subversive do not support multiple src paths. Can anyone confirm this? Solutions?

    Read the article

  • Which open source repository or version control systems store files' original mtime, ctime and atime

    - by sampablokuper
    I want to create a personal digital archive. I want to be able to check digital files (some several years old, some recent, some not yet created) into that archive and have them preserved, along with their metadata such as ctime, atime and mtime. I want to be able to check these files out of that archive, modify their contents and commit the changes back to the archive, while keeping the earlier commits and their metadata intact. I want the archive to be very reliable and secure, and able to be backed up remotely. I want to be able to check files in and out of the archive from PCs running Linux, Mac OS X 10.5+ or Win XP+. I want to be able to check files in and out of the archive from PCs with RAM capacities lower than the size of the files. E.g. I want to be able to check in/out a 13GB file using a PC with 2GB RAM. I thought Subversion could do all this, but apparently it can't. (At least, it couldn't a couple of years ago and as far as I know it still can't; correct me if I'm wrong.) Is there a libre VCS or similar capable of all these things? Thanks for your help.

    Read the article

  • How do I move a file (or folder) from one folder to another in TortoiseSVN?

    - by codeflunky
    I would like to move a file or folder from one place to another within the same repository without having to use Repo Browser to do it, and without creating two independent add/delete operations. Using Repo Browser works fine except that your code will be hanging in a broken state until you get any supporting changes checked in afterwards (like the .csproj file for example). Update: People have suggested "move" from the command line. Is there a TortoiseSVN equivalent?

    Read the article

  • Unusual Subversion Folders Appeared After Update

    - by Mark Lansdown
    Hello Everyone, I have been using Subversion for about 2 years to manage a large C# project. On a recent Subversion update, a number of new folders were added to my source code folder: \conf \db \locks \hooks 35+ files were also added during the update, all appearing under the 4 new folders. I haven't changed any client (I use TortoiseSVN) or server software related to Subversion, so I'm puzzled why these folders and files were suddenly introduced. It also seems strange that files seemingly related to the internal workings of Subversion are now part of my source code repository. Can anyone shed some light on why this happened? Thanks in advance, Mark

    Read the article

  • git: import changes form non git repository

    - by takeshin
    Scenario: Local git repo, default master branch FTP server with content of the repo (non git), synchronized daily with the local repo, master branch Workflow: user1 is working on local git repo (git add, working directory clean) user2 (non git user) changed files directly on the FTP server How can I import all files changed on FTP to the local git repo and see what has changed?

    Read the article

  • How can I match a partial data set with a full one in a spreadsheet?

    - by askvictor
    I have a spreadsheet (in Google Docs, but can be any spreadsheet) with a list of users (one per row), including a username (and other columns). Lets say there are 'n' rows. I have another spreadsheet with less than 'n' rows. One column has a username, another column has some other piece of data (lets say car rego number). I want to move the car rego number to the corresponding user in the first spreadsheet. How might I do this?

    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

  • Excel - Combine multiple columns into one column

    - by Akib
    Hey everyone. I'm new to excel and VBA and I'm stuck at this problem. I have multiple lists that are in separate columns in excel. What I need to do is combine these columns of data into one big column. I do not care if there are duplicate entries, however I want it to skip row 1 of each column. ROW1| 1 2 3 ROW2| A D G ROW3| B E H ROW4| C F I should combine into A B C D E F G H I The first row of each column needs to be skipped.

    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 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

  • Subversion: who am I logged in as?

    - by mikez302
    I am working on a collaborative project, and I would like to know who I am logged in as. Am I logged in as myself or someone else? If I check in my work, what username will be associated with the commit? I am never prompted for a username or password. When I commit changes, they just get committed under someone else's name. I would like them to be committed under my name. I tried the "--username" option as described on this page, but it didn't seem to work. I did a commit and it was done under the other user's name. I would like some way of knowing for sure that my changes will be committed under my name before I do the commit.

    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

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