Search Results

Search found 4819 results on 193 pages for 'git merge'.

Page 145/193 | < Previous Page | 141 142 143 144 145 146 147 148 149 150 151 152  | Next Page >

• Why am I getting this SVN can't move .svn/tmp/x to trunk/x error?

  - by Alex Waters

  I am trying to checkout into the virtualbox shared folder with svn 1.7 in ubuntu 12.04 running as a guest on a windows 7 host. I had read that this error was a 1.6 problem, and updated - but am still receiving the error: svn: E000071: Can't move '/mnt/hostShare/code/www/.svn/tmp/svn-hsOG5X' to '/mnt/hostShare/code/www/trunk/statement.aspx?d=201108': Protocol error I found this blog post about the same error in a mac environment, but am finding that changing the folder/file permissions does nothing. vim .svn/entires just has the number 12 - does this need to be changed? Thank you for any assistance! (just another reason for why I prefer git...)

  Read the article

• How to install software packages on a shared Red Hat Linux host account without root access or rpm?

  - by jeff

  I have a shared RHEL 4 host account where I do not have root privileges. I would like to install Git and Bash Complete in a way that they can be upgraded easily. To date, I've just been installing from source providing $HOME as a prefix to autoconf. Obviously this isn't ideal as I need to hunt down the files associated with the version I'm upgrading away from and delete them. I've tried using rpm but I just get -bash: rpm: command not found back so it's not available. I also looked into checkinstall but it looks like that requires rpm, dpkg, or Slackware's package manager to be available. Is there anything out there that can be used like a package manager without requiring root access or an existing package manager?

  Read the article

• Problems installing Ruby 1.9.2 and rvm on Debian Lenny

  - by Dave Everitt

  I have currently have Ruby 1.9.1 (bad) and want to install 1.9.3 under rvm. However, rvm requirements gives a long list: install build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison subversion But I've hit a problem here: /# apt-get install libreadline6 Reading package lists... Done Building dependency tree Reading state information... Done E: Couldn't find package libreadline6 ...and (I imagine after just hunting down a Debian source to download curl) finding these packages isn't going to be a picnic. Given that there are few packages to install before I can get rvm to install Ruby 1.9.3, what's a good way forward? My sources.list: deb http://archive.debian.org/debian/ lenny main contrib

  Read the article

• Configure Console2 to open bash in current folder

  - by davidkennedy85

  I've seen this but it doesn't work for me. I'm not using Git's version of bash but the one that comes with cygwin, so that could be part of the problem. Here is how I have my tab in Console2 set up: Title: bash.exe Shell: C:\cygwin\bin\bash.exe --login -i Startup dir: %HOMEDRIVE%%HOMEPATH% This is my registry entry: Directory shell Console2 Open Console2 Here command "C:\Console2\Console.exe" -d "%1" bash always starts in my home directory instead of the directory I'm clicking on, then I have to cd /cygdrive/d/code ... etc. I tried removing the value in the "Startup dir" field, changing it to %1, %1% with no luck. I also tried this solution but it didn't work for me either: Title: bash.exe Shell: C:\cygwin\bin\bash.exe -l Registry: Directory shell Console2 Open Console2 Here command "C:\Console2\Console.exe" -d "%V" .profile file in root directory: cd - Any ideas?

  Read the article

• How to use BT or emule across 2 or more hard drives?

  - by the searcher

  One difficulty with BT or emule is that, when the hard drive is full, we constantly need to move older files to a new hard drive so that we can download newer files. We can change BT or emule's setting so that the folder for downloading points to the new hard drive, but then, what if emule haven't finished downloading for some files that are hard to find, and it is 92% done... in that case, we would like to keep the old setting so that when the last 8% arrives, it can go into the correct file. (and same for BT, if we haven't finished some file or if we want to seed something later). So is there a good way to let BT or emule point to 2 hard drives, or somehow let the new hard drive "merge" into the existing hard drive / folder?

  Read the article

• Keeping my zsh or bash profile synced up on all my machines.

  - by Joseph Silvashy

  I work on several different machines, all of which are *nix. I have a lot of specific things I like my shell to, or the prompt to look like, or aliases, etc, etc. I'm sure all of you folks deal with this as well. What do you think the best way to keep all my machines' shells to act the same? First off, I'm aware that different machines will need different paths to bins and other differences, so my first inclination is to just include a file at the end of my profile, this is the one that we'll keep in sync. What is the best way to keep files synced up? I can put the file on a remote system, and perhaps use git, to push, then pull my changes every once and a while. However, isn't Rsync better suited for this?

  Read the article

• How can I move my partition in GParted?

  - by reprogrammer

  The following is a screenshot of GParted run on my system. There is a small unallocated space at the beginning of the list. This 1 MiB space is kind of annoying and I'd like to merge with any other partition except /dev/sda1, /dev/sda6 and /dev/sda4. When I right click on the unallocated partition, the only available operation is "New". And, if I click on "New", I get the following error message. It is not possible to create more than 4 primary partitions Any ideas of how to go about merging the small unallocated space with other partitions?

  Read the article

• Jenkins shows same information for all projects

  - by SuperCabbage

  I've been using Jenkins for the last month or so and what started out as a small issue has gotten worse and worse. I have 10 projects in Jenkins, all polling from different Git repos and building to different environments but they all show the same details on the dashboard. I can still build the projects, but I have to manually enter the URL to see any console output etc. I'm running 1.536 under Ubuntu 12.04, there's not much in the logs other than the following; Oct 22, 2013 2:21:19 PM WARNING jenkins.model.lazy.AbstractLazyLoadRunMap search JENKINS-15652 Assertion error #1: failing to load /data/builds #20 EXACT: lo=23,hi=9,size=23,size2=23 – Any ideas?

  Read the article

• What's wrong with my custom .desktop xsession?

  - by Noam Gagliardi

  I want to create a custom Xmonad session that loads an .xsession script in my home folder. This is the original file I copied. This one works: [Desktop Entry] Encoding=UTF-8 Name=XMonad Comment=Lightweight tiling window manager Exec=xmonad Icon=xmonad.png Type=XSession This is my modified file, xmonad-custom.desktop. When I logout, then login choosing this "xmonad-custom", the screen just flashes and sends me back to the ubuntu login screen (as if it briefly logs in and out of the session): [Desktop Entry] Encoding=UTF-8 Name=XMonad Custom Comment=Lightweight tiling window manager Exec=/home/{username}/.xsession Icon=xmonad.png Type=XSession X-Ubuntu-Gettext-Domain=gdm I also tried without the last line. This is my ~/.xsession file, in case there's an error with this script: #!/bin/env bash xrdb -merge .Xresources trayer --edge top --align right --SetDockType true --SetPartialStrut \ true --expand true --width 15 --height 12 --transparent true --tint 0x000000 & dropbox start & exec xmonad

  Read the article

• Using Excel data in Microsoft Publisher

  - by TK

  I have never worked in Microsoft Publisher. To build the presentation we're having to input the same information from a microsoft excel master. For instance- My excel has these columns: Item Title, Item Description, Item Dimensions, Notes, Created Date From there, I'm having the RE-type the information underneath a picture of the item in powerpoint (or publisher) in order to present to the client. So I'm retyping the item name, description, dimensions, etc. I'm also reformatting slides each time I do this. I know there's a way to streamline this process, to build a powerpoint and/or something in publisher that will bring in the data needed based on a merge (or maybe macro), but I haven't been able to figure out how. Any suggestions?

  Read the article

• capistrano still asks for the 1st password even though I've set up an ssh key???

  - by Greg

  Hi, Background: I've setup an ssh key to avoid having to use passwords with capistrano per http://www.picky-ricky.com/2009/01/ssh-keys-with-capistrano.html. A basic ssh to my server does work fine without asking for passwords. I'm using "dreamhost.com" for hosting. Issue - When I run 'cap deploy' I still get asked for the 1st password (even through the previous 2nd and 3rd password requests are now automated). It is the capistrano command that start with "git clone - q ssh:....." for which the password is being requested. Question - Is there something I've missed? How can I get "cap deploy" totally passwordless? Some excerts from config/deploy.rb are: set :use_sudo, false ssh_options[:keys] = [File.join(ENV["HOME"], ".ssh", "id_rsa")] default_run_options[:pty] = true thanks PS. The permissions on the server are: drwx------ 2 mylogin pg840652 4096 2010-02-22 15:56 .ssh -rw------- 1 mylogin pg840652 404 2010-02-22 15:45 authorized_keys

  Read the article

• Problems serving SVN over HTTPS on Ubuntu 10.04

  - by odd parity

  We've been experiencing some problems with our Subversion server after upgrading to Ubuntu 10.04. When trying to access a repository, regardless of client (I've tried git-svn and svn on Windows as well as svn on Ubuntu 10.04, from different computers and network locations), I get a 400 bad request. Here's the output from svn: svn: Server sent unexpected return value (400 Bad Request) in response to OPTIONS request for 'https://svn.example.org/svn/programs' Here are the relevant entries from the Apache logs (I'm running Apache 2.2): error.log [Mon Jun 14 11:29:31 2010] [error] [client x.x.x.x] request failed: error reading the headers ssl_access.log x.x.x.x - - [14/Jun/2010:11:29:28 +0200] "OPTIONS /svn/programs HTTP/1.1" 401 2643 "-" "SVN/1.6.6 (r40053) neon/0.29.0" x.x.x.x - - [14/Jun/2010:11:29:31 +0200] "ction-set/></D:options>OPTIONS /svn/programs HTTP/1.1" 400 644 "-" "SVN/1.6.6 (r40053) neon/0.29.0" If anyone has run into similar problems or could give me a pointer to track down the cause of this I'd be very grateful - I'd really like to avoid having to downgrade the box again.

  Read the article

• Download a website that requires log-in with HTTtrack Copier

  - by H.Moss

  Hi guys! I have been researching of how to download content of a site that requires username and password. This is actually harder than I thought it would be. I tried to use both HTTtrack Copier and followed the instruction below, but it's not working! Q: I can not access several pages (access forbidden, or redirect to another location), but I can with my browser, what's going on? A: You may need cookies! Cookies are specific data (for example, your username or password) that are sent to your browser once you have logged in certain sites so that you only have to log-in once. For example, after having entered your username in a website, you can view pages and articles, and the next time you will go to this site, you will not have to re-enter your username/password. To "merge" your personnal cookies to an HTTrack project, just copy the cookies.txt file from your Netscape folder (or the cookies located into the Temporary Internet Files folder for IE) into your project folder (or even the HTTrack folder)

  Read the article

• SQL Server Replication Agent priority

  - by Wikser

  Every hour a server replicates SQL server data with some external web server. During this time, which takes about 2-5minutes, the database seriously slows down. Colleagues, which work with the front end applications of that on another terminal server, even regularly start complaining. The databases are also synchroniously mirrored (via SQLServer mirroring, no replication) to a third server. Note that 99% of the data is replicated outgoing, so the server should rarely need to update its data. As the (merge and transactional) replication tasks are not time-critical, I would like to reduce their priority or somehow slow them down, so they don't affect the database performance that much. How would you implement that?

  Read the article

• Compiling Ruby on Mac OS X Snow Leopard

  - by gryzzly

  Hi, I am trying to follow this tutorial, on the subject of compiling ruby and rubygems on Snow Leopard: http://hivelogic.com/articles/compiling-ruby-rubygems-and-rails-on-snow-leopard I have added this to my ~/.profile: export PATH="/usr/local/bin:/usr/local/sbin:/usr/local/mysql/bin:$PATH" But if I write: echo $PATH I get: /opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:/usr/X11/bin But in tutorial it says: You should see /usr/local/bin at the beginning of the line returned by the system. I have installed macports sometime ago and plenty of other software, perhaps it has changed the path. Anyway, I have tried to proceed with the installation, so I have built ruby, I did: ./configure --enable-shared --enable-pthread CFLAGS=-D_XOPEN_SOURCE=1 make sudo make install cd .. But when I do which ruby I get: /usr/bin/ruby And according to the tutorial that's wrong. Also if I do ruby -v I get the older version of ruby that was preinstalled on Snow Leopard and not the one I've compiled. Thanks.

  Read the article

• Can I list file names (or their parent directories) that were recently deleted using rm in OS X?

  - by Andrew Grimm

  Is it possible to find out which files and directories have recently been deleted by rm in OS X? Or failing that, is it possible to find which parent directories have had files or directories within it deleted? The OS version is Snow Leopard. Background: Last night, rvm (ruby version manager) did rm -rf of the ~/ruby directory from the home directory. (This bug has since been fixed) Ideally, I'd like to know what files within the ~/ruby directory were deleted, but failing that, I'd like to know if rvm deleted anything outside of ~/ruby . In case anyone's wondering about backups...: Just about everything within ~/ruby is a git project that has a remote repo, and I have a fairly recent Time Machine backup (only 20 days old).

  Read the article

• Cross-forest GPO between 2003 and 2008 Denied Beacuse it's "Inaccessible"

  - by j.rightly

  I have a two-way, non-transitive trust between two forests and domains, "W2003" and "W2008". In W2008 I have a GPO with user settings linked to a machine OU containing machine "Server". The GPO applies to Authenticated Users. Cross-forest loopback processing is enabled in merge mode. When I log onto Server as User (whose account exists in the W2003 domain), the GPO does not apply. I run RSoP and see that the GPO is "Denied" for the reason "Inaccessible." The GPO name is not listed, but the GUID is. I have checked the file-level permissions on the DC to ensure that User has access to read the GPO's folder and all its contents. What is going on?

  Read the article

• iSCSI RAID1 on two servers, fail scenario

  - by Franz Kafka

  Hallo, a simple question: Image I have two servers, each server has two disks in RAID1. Now I merge the two arrays with iSCSI to one RAID1 disk. Two questions: Can I do the merging of the 4 disks in one go? I can't image how. First I will have to install the os, and then the raid controller is already set up to RAID1. If a whole server fails the other server would continue working without any problems? Does iSCSI notice that the other server is missing and treet this as if the two disks were broken? When the server comes back online the data is resynced, as if I installed new disks into a array? Can I image that this way? Thanks alot.

  Read the article

• Debian no lib32asound2-plugins=1.0.25

  - by erai

  I compiled git wine 1.5.6 and the sound is not working correctly. winecfg gives a message: ALSA lib ../../pulse/pcm_pulse.c:995:(_snd_pcm_pulse_open) Unknown field handle_underrun err:winediag:AUDDRV_GetAudioEndpoint PulseAudio "default" -22 without handle_underrun. Audio may hang. Please upgrade to alsa_plugins >= 1.0.24 err:ole:CoInitializeEx Attempt to change threading model of this apartment from multi-threaded to apartment threaded But on wheezy there is no package lib32asound2-plugins 1.0.25 So, how do I build and package alsa-plugins to install to lib32? Or how do I use automake's configure to compile a 32bit lib on a 64 bit system. All I Need now is the libavcodec-dev for 32bit, but I don't understand. What is the 32bit libavcodec-dev package for amd64 debian?

  Read the article

• Modifying %HOME% on Emacs 24.3 on Windows causes .emacs to not be found

  - by David

  In order for magit to read my git settings on Emacs 24.3.1 for Windows, I added the following configuration from a stack overflow post: (when (string-equal system-type "windows-nt") (setenv "HOME" (concat (getenv "HOMEDRIVE") (getenv "HOMEPATH"))) Interestingly, after this is added to my .emacs, Emacs thinks .emacs doesn't exist anymore. If I do M-x cd to ~ and then do M-x pwd it says ~ is located at C:\Users\Me\AppData\Roaming. It appears that emacs is reading the .emacs settings file because it loads my custom theme. However, if I try to find ~/.emacs Emacs doesn't see it. The file has all permissions on the file system for any user.

  Read the article

• Un-table a cell range in Excel 2007

  - by Joe

  In Excel 2007, if you highlight a block of cells and then "Format as Table", it doesn't just apply colors and formatting, it somehow marks those cells as being a table. Now I want to get rid of the table, but keep all the cells (i.e. keep the data). So I tried clearing the table style and formatting, but Excel still recognizes those cells as being a table. I can tell because: When I select a cell that was in the table, Excel still displays the "Table Tools / Design" tab I cannot merge cells that were in the table <- this is what's annoying me So, how do I un-table those cells? I want to keep all the cell data and formatting, but have Excel not recognize them as a table.

  Read the article

• How can I view updatedb database content, and then exclude certain files/paths?

  - by rubo77

  The updatedb database on my debian server is quite slow. where is the database located and how can I view its content and find out if there are some paths with useless stuff, that I could add to the prunepaths? my /etc/updatedb.conf looks like this: ... # filesystems which are pruned from updatedb database PRUNEFS="NFS nfs nfs4 afs binfmt_misc proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs shfs sysfs cifs lustre_lite tmpfs usbfs udf" export PRUNEFS # paths which are pruned from updatedb database PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /alex /var/spool /sfs /media /var/backups/rsnapshot /var/mod_pagespeed/" ... and how can I prune all paths that contain */.git/* and */.svn/* ?

  Read the article

• Win7 OpenSSH config: no address associated with name

  - by Jonah

  I am using OpenSSH on win7. My home dir is C:\Users\JG, and inside that dir I have the file C:\Users\JG\.ssh\config, with these contents: Host <redacted server ip here> HostName digitalocean_git User git IdentityFile ~/.ssh/digitalocean_moocho/id_rsa The id file pointed to by the "IdentityFile" entry works, as I use it just fine via putty, but for this problem I am trying to get command line OpenSSH working. The crux of the problem is explained by this output: >ssh -v digitalocean_git OpenSSH_4.6p1, OpenSSL 0.9.8e 23 Feb 2007 debug1: Reading configuration data /c/Users/JG/.ssh/config ssh: digitalocean_git: no address associated with name Why is no address associated with the name? How can I make this work?

  Read the article

• VirtualBox, physical disks, and snapshots

  - by noamtm

  I have an Ubuntu guest installed on a raw HDD (entire disk, not a partition). It runs just fine under WinXP. In addition, I was able to boot directly into it (using the BIOS boot-device selector). At some point, I have created a snapshot of the VM. I have made some changes since then. Today, after a long time, I tried booting into the "VM" disk. It worked, but all the data there is pre-snapshot (or, rather, frozen at the snapshot). Can I somehow merge the changes since I took the snapshot into the physical state?

  Read the article

• Adding unallocated partition to Ubuntu in VMware

  - by AMS949

  I've installed Ubuntu 9.10 on a Windows XP using vmware. As most do, I initially setup the size of the virtual drive to 8GB and soon realized I need more. I used the VMware utility to expand the virtual drive and added another 4GB, which I can see using GParted. Now my dilemma is how can I "merge" the newly created space to my original? I need to add the unallocated space. I tried before and after formatting the new space but still whenever I try to resize/move /dev/sda1 it looks like it is using its maximum capacity. Also, GParted is being used from the GParted live CD not from the Linux live CD.

  Read the article

< Previous Page | 141 142 143 144 145 146 147 148 149 150 151 152  | Next Page >