I have a new folder in my directory, called 'newfolder'
When I create a diff file there is no mention of this new folder in it.
When I do 'svn add newfolder' it says: svn: warning: 'newfolder' is already under version control.
How do I get my newfolder to be included in my diff file so that it is included when someone else patches my file in their own directory
Why does it say that the 64 bit version is not recommended for daily desktop use?I am so excited to finally have a computer of my own that if fast enough to run things like Ubuntu..
View 5 Replies View RelatedI am in need of recommendations what software to use to keep track of development files in my office. I wish to have a central server which holds the source code of our software. There will be two dev staff working concurrently on the same files. Also i need it to be accessible by Eclipse or any equivalent IDE software.
View 5 Replies View RelatedI want to set up a very simple version control system in my own computer, which only I will use. I want to use it mainly for latex files, not programming. I basically want to use it as a smart backup system and to keep track of past versions, but I don't need merging, patching, etc... My typical needs are the following:Work on a file many times and committ the changes every couple of days.Every now and then, try something new, and do it on a new branch. If it doesn't work, go back to the original one.
Take a look at a previous version (often a binary file, say a pdf or dvi file).I have used git so far, for no special reason, but I haven't been able to get comfortable with it, specially since it only handles text files efficiently (I think). My main issue is with point 3 above, I haven't found a way (maybe there's just no way) of pointing to a previous version of a file and opening it in an external program. Would CVS or SVN or any other version control system allow me to do this easily?
Where is the version control repository for source RPMs? When a package maintainer makes a change, he or she must commit the change somewhere. Where is that, and is it publicly viewable?
View 2 Replies View RelatedI want to setup a git repository, three of four users will contribute, so they need to download the code and shall be able to upload their changes to the server or update their branch with the latest modifications.So, i setup a linux machine, install git, setup the repository, then add the users in order to enable the acces throught ssh.Now my question is, What's next?, the git documentation is a little bit confusing,i.e. when i try from a dummy user account to clone the repository i got:
xxx@xxx-desktop:~/Documentos/git/test$ git clone -v ssh://xxx@192.168.1.104/pub.git
Initialized empty Git repository in /home/xxx/Documentos/git/test/pub/.git/
xxx@192.168.1.104's password:
[code]....
I want to store some of my configuration files (~/.emacs.d/, .Xdefaults, etc. linux $HOME stuff) in version control so I can easily sync them with my notebook/workplace and see my past changes and revert to them should the need arise.
So far it seems to me that there are quite some people using git for this and I think that I too want to use a distributed vcs for this (if only to get more used to them) but I can't say that I am very experienced with all things dvcs. I did use darcs and git briefly and so far I can say that I really like the way git handles branches, and I think the possibility to have different branches within the same directory is especially useful for my use case. Darcs on the other hand has cherry picking of patches, which too is quite the convenient feature when managing configuration files (at least I assume it is).
So, what would you recommend to use? And what would be your reasoning for your recommendation? What other vcs with nice feature that I haven't mentioned exist and would make a good vcs to store configuration files and why?
I have this project at work. We are a MS Windows shop, and I am "supposed" to be the linux expert, which means, linux support, it's me. I have worked with linux maintaining PCs at home with different versions of linux since 1995, jumping from Slackware to Ubuntu.
Now, I have two CentOS 5.6 boxes, and I need to control the patching process. the boxes are hosting an application which we don't manage. So. one box in production, one box in development. The idea is that the box in development wil use yum in a standard way and download whatever patches are needed, and the application is tested. When the testing is done (this can take minutes, hours, or days) then the production box gets patched.
The problem is that I need to garantee that exactly the same patches are applied in development and in production.
the development box downloads the patches from the internet, but the production box gets it's patches from the development box, not the internet. I have played around with making local repos on the development box and samba, or rsync the /var/yum/cache, and to change the yum.repo.d CentOS-base.repo to force the prod to go to the dev box, without success.
I'm looking for an open source web based version control system for our enterprise.To give you a quick picture of what we need I'll give you an example.
1.The customer send us some files for a new project (these will be the version 1.0)
2.We work on these files and make then available to the customer to let him verify that our changes are what he want. (These will be the version 2.0)
3.The customer accept.
4.We start the production.
I've made a linux app that I'm porting to win32 winth MinGW and MSYS. It's a ticker app that reads then renders a text file to a pixmap (a tall single-line image), then it kind of scrolls the pixmap by drawing a part of it to a drawing_area, using gdk_draw_drawable() within a timeout handler set by g_timeout_add().
The problem is it works fine on linux (the scrolling is really smooth and that's the goal) but the win version is choppy and uses at least 90% of cpu resources (vs 15% with linux) like there is a big performance problem. And I'm not even sure that double buffering is set. Is it related to some mingw config or drawing_area stuff or gtk for win?
I think a version control system should be integrated by default into the user's documents directory. Any time a file is saved, the app would check to see if there is another file by the same name, and if there is, make a hidden copy of the previous version with name such as ".filename.[datestamp]" . This would be similar to what gEdit already does, but at a broader level.
A more robust system would include controls for watching more directories. It would also show comparisons with previous versions of the document. Being file based, it wouldn't care if unneeded backup files are destroyed.
If file space is an issue, backup files would only contain the differences between the next and previous versions. This would mean, however, that back-up files would be useless if a few are irretrievable.
Obviously, users would be able to turn this app on or off, if they don't need/desire this feature.
I currently have 10.04 installed as my primary OS. I also have windows 7 and Ubuntu 10.10 Alpha installed. I would like to be able to play around with the 10.10 without any risk of damaging my 10.04 install. However, it seems grub2 control was transfered to 10.10. How do I return control to my original distro?
View 2 Replies View RelatedI have installed Catalyst 10.10 to Ubuntu 10.10 using the following methodology:
Code:
wget http://someplace/ati-driver-installer-8.783_RC1-x86.x86_64.run
chmod +x ati-driver-installer-8.783_RC1-x86.x86_64.run
[code]....
I'm a freelance science editor; I edit dissertations and manuscripts for submission to peer-reviewed journals primarily. My clients almost exclusively use Microsoft Word. Any word processing tool that I use has to be compatible with MS Word, particularly "Track Changes" version control. Has OpenOffice (or another open source word processing software) achieved this?
View 1 Replies View Relatedif it's possible to use a white or blacklist to control which folders are ecryptfs encrypted when you're using the "encrypted home folder" option.
Of course I can always create an extra folder outside of my ~ and then symlink what I don't want encrypted into it, but I'd rather that it's possible to create like, ~/.ecryptsfs/excludelist with a list of paths that shouldn't be encrypted.
In gcc, does anyone know how to suppress a particular warning. I want to suppress "warning: useless storage class specifier in empty declaration"
View 6 Replies View RelatedI been using linux for a while, but I havent had the time to really learn it. Something Id like to get more familiar with is bash so here is a simple example of something I would like to do:
I have a directory full of files. For each file in the directory create a new subdirectory with each files name.
I tried this:
#im already in this directory
aaa=./*
for a in $aaa
do mkdir $a
done
One of the problems is that there are spaces () and - in the filenames so I get many subfolders with names like "-" which i don't want.
I tried stuff like:
aaa=./*
for a in $aaa
do mkdir "'"$a"'"
done
This of course also did not work.
Additional I tried just creating a folder with the name of one of the files and I got this:
mkdir: cannot create directory `(audio) - R56339.EXE': File exists
Well yeah a file exsists with that name, but I want to create a folder- why is there a conflict?
Just to be clear here are the contents of this folder:
~/Desktop/LAB/Media/Drivers - (Image Deployment)/Optiplex_GX260/XP> ls
(audio) - R56339.EXE (NIC-Onboard-Intel) - R54402.EXE
(Modem-datafax-V92) - R54403.EXE OEM_Applications
[Code].....
I have two computers with Ubuntu 10.10 running and I am trying to share a folder using NFS version 3. On the server I have these packages installed: nfs-kernel-server and nfs-common and on the other computer I have: nfs-common I can get the folder shared across on the 2nd computer but when I do a "ls -l" I get bad uid and gid's: -rw-r--r-- 1 4294967294 4294967294 15 2010-09-30 20:15 test.txt All the files have these same numbers for the uid & gid.
[Code]....
For the following compilation warning message I need to create some sample program in C for self study. Also I am looking for some good web link where all the C warnings are described.
1. Warning #47: incompatible redefinition of macro "entity" . Undefine macro before
2. Warning #167: argument of type is incompatible with parameter of type
3. Warning #175: subscript out of range
[code]....
I am running a PHP script using the GD library on a Linux server. When I try to load a font using PHP's imageloadfont(), GD replies with:
Code:
gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
Linux kernel is 2.6, PHP version is 5.2.9 and GD is 2.0.34.
I have tried several different font but all have the same issue. Does anyone know what the error means?
I am writing a sample nasm program via terminal.It's a basic one ,it only demonstrates the usage of the zero and sign flags and print relevant message to the output. Here are the code:
Code:
SECTION .data; data section
errMsg:db "Error !",10
errLen:equ $-errMsg
zeroMsg: db "Zero flag",10
zeroLen: equ $-zeroMsg
[Code]....
I've just moved onfrom developing some code on Debian (gcc 4.1) to Ubuntu (gcc4.4) and a warning in my g++ code has appeared. Basically in some serial prot code I get this errorwarning: ignoring return value of 'ssize_t write(int, const void*, size_t)', declared with attribute warn_unused_resultfrom function
void TxChar(COMPORT *port,unsigned char letter)
{
pthread_mutex_lock( &txmutex );
[code]....
I'm trying to link 'aubio' (a lib) and its failing on one of ts dep's with this error.
Code:
$ make
Making all in src
make[1]: Entering directory `/home/John/Externals/aubio/aubio-0.3.2/src'
make all-am
[code]....
"Warning: This system can not link to static lib archive /usr/local/lib/libff"
I've configured/make/make installed fftw and its doing just fine in the usr/lib folder, so I'm at a loss at how to fix this. Do I need to build fftw again using some kind of shared make switch? I couldn't find any referance about that.
i tried stat and S_ISLNK(st.st_mode) but it always evaluates to false :/ is there anyway i can tell if a folder is a link to another folder?
View 6 Replies View RelatedI just wrote a simple perl script to compare the following two files
[Code]...
I've just updated my linux system (Debian) and went to compile some code I'm working on. However it causes some problems, presumable because of GCC up dates. I get many of my subject line errors for example
../../common/Version_Control.cpp: In function int VersionControl():
../../common/Version_Control.cpp:55: warning: deprecated conversion from string constant to char*
So I check up the error and it comes from my error handler code which is a function
extern void SetError(char *string,int error_number)
The net tells me all I need to do is convert char *string to const char *string, however when I do so and recompile I get the following error
Error_Control.cpp: In function �void SetError(const char*, int)�:
Error_Control.cpp:41: error: invalid conversion from �const char*� to �char*�
make: *** [Error_Control.o] Error 1
I think I've done exactly what's recommended ?
My problem is that the warning keeps apperaing when I run g++ compilation.
Say, I have a system runtime function with header (imaginary)sysruntime.h: void printfunction(char *line);
Then in my .cpp file, I will include the above header #include <sysruntime.h>
Then, I do the below:
Line12: char *linetoprint = "Print this line";
Line13: printfunction(linetoprint);
But, I will get the warning message "Line12: deprecated conversion from string constant to 'char*'". (Even though it compiles)
My question is how should I declare my char* so that I wont get this warning message, and can still run printfunction(char* line) correctly?
i just tried to install Ubuntu Netbook 10.04 on my old Amilo Lifebook P Series. But after the boot screen and the choice to install Ubuntu i get stuck at the Ubuntu screen with the little dots on the bottom If I hit esc i can see the warning (process 257): GLib-WARNING **: getpwuid_(r) failed due to unknown user id (0)
View 2 Replies View RelatedIf I wanted to transfer a home folder that was encrypted to another ubuntu computer could I? If I had a separate home partition that was encrypted, but I wanted to upgrade ubuntu to the latest version by doing a clean install is there an easy way so that I can still read the data encrypted with the old version?
View 5 Replies View RelatedI have Centos 5.3 on our server When I log-in in webmin I have a message "Warning - Your system is actually running CentOS Linux version 5.3." In the next line I have a button "Update Detected Operating System" My question is Do I need to click the link and update Detected operating system? If I do, is it going to change any configuration on our server?
View 2 Replies View Related