General :: Proper Way To 'sync' Branches And Keep Them Separate?
Jul 26, 2010
So I created a new branch from master and eventually merge the changes back, only some changes seemed to merge and it would seem I merged in one direction. Eventually I just decided to be sure master received all the 'experimental' changes then I deleted the experimental branch and made a new one. So this question is turning into a few questions suddenly:
1) How do I match up branches but keep them separate?
1a) Is that bad practice to not just make a new branch?
2) Why were the branches not the same after after one merge?
2a) Am I only supposed to call a merge on the one that I want to have all of the changes?
View 1 Replies
ADVERTISEMENT
Aug 21, 2010
I have been tooling around with different way of getting our local Debian network mirror back up and running with different various scripts. I have tried apt-mirror which was a breeze to setup and run, anonftpsync again super easy to get rolling.
My question is there a way to make sure our Sarge distro doesn't get deleted from the mirror? A filtering command for rsync possibly?
I started to go over the script for the ftpsync (debian recommended!) and to be honest it seems way over my head due to lack of documentation that I have been able to find.
View 2 Replies
View Related
Jul 22, 2011
Are the packages interchangeable "within" Linux branches? Between branches? Where is the dividing line?For example, within the Fedora branch there are various Desktop Environments, each with their own versions of very similar packages (text editors, terminal, file managers).My scope of my question is intended to only include the Linux family, while I guess a more interesting question would be if unix is unix is unix :)
Bonus points for "where" answer, ie. QT Framework VS. GTK+, or RPM Package Manager as one package format among 8+ for Linux.I can gues the why. No doubt due to "programmer hubris" (^_^)
View 2 Replies
View Related
Jan 9, 2011
I wanted to know how can I find out how many usbs my device has in command line.I used some but they just show me the usb buses without their sub usb branches:
Quote:
lsusb -t
usb-devices
lshal | grep usb.linux.sysfs_path
none of the above show me the complete usb bus and its sub usb's. how can I see that?
View 6 Replies
View Related
May 5, 2010
I'm extracting data from a xml file writing it to separate files then combining the results as a csv file.The problem is keeping the separate files in sync line by line.When a grep does not action I would like to put in a blank line or something to keep the lines in order.When the "<title>" is missing as in as in the first"<programme </programme>" that's where I need somethingto write to the file as dummy data to increment the line
here's the data
Code:
<programme channel="15552.dvb.guide" start="20100504200000" stop="20100504204000">
<category>Show / Game Show</category>
</programme>
<programme channel="14498.dvb.guide" start="20100504200000" stop="20100504203000">
[code]....
View 14 Replies
View Related
Sep 19, 2011
I've discovered Firefox Sync a while ago, and it's absolutely awesome. Now of course I'd like most of my software to work this way! So is there a way to get the same behavior with Thunderbird?
View 1 Replies
View Related
Oct 24, 2010
I use jpilot on opensuse 11.3 64bit to sync pim data with my Palm Treo 680 via bluetooth. This worked fine until today. Now I get the following error message when I try to sync: Syncing on device bt: Press the HotSync button now dlp_ReadSysInfo error Exiting with status YNC_ERROR_PI_CONNECT Finished.
The last successfull sync was on the 20th October and today is the 24th October. I did not change any settings in jpilot or on my palm device. So I guess there must have been an update of opensuse which causes this error. But I do not now how to look up the updates during this period or how to undo them. Was there an update between the 20th and the 24th Oktober, which might affect either jpilot or bluetooth functionality?
View 1 Replies
View Related
Sep 10, 2010
I've got Ubuntu One syncing a single 25MB folder on 4 computers. On one of these computers, the ubuntuone-syncdaemon process constantly pegs the CPU, using from 50-80% long after any sync-able files have been modified and successfully synced. The process is only using 8.9MB of RAM.
Specs:
Ubuntu 10.04 (lucid)
Kernel 2.6.32-24-generic
1000.8 MB RAM
Pentium 4 2.53GHz
Free disk space: 280.9 GB
System monitor shows 56.8% total RAM usage, 15.4% swap file usage.
View 3 Replies
View Related
Jul 9, 2011
Audio sync method. "Stretches/squeezes" the audio stream to match the timestamps, the parameter is the maximum samples per second by which the audio is changed. -async 1 is a special case where only the start of the audio stream is corrected without any later correction.Searching the net makes one believe that this command is just some sort of magic.People just put it in the line and it just works. Isn't that nice?
It says nothing about how to change the TIME the audio starts syncing. Like do I want it to start 5 seconds delayed? Or what about 5 seconds sooner?What if the audio gets more out of sync as the video goes on? Can I slip it a little at a time? What? No magic?No one mentions a file that already has badly synced audio.So what -async 1 really does is simply start the audio at the beginning of the file. LIKE AS IF THAT ISN'T STANDARD PROCEDURE?So what is the exact solution to syncing a messed up video? And why can't it just do the proper "timestamp" sync in the first place?No docs, no info and you are left out in the cold.
View 4 Replies
View Related
Jul 25, 2011
Decided to try to use my console but it didn't work the way I thought it would. What is the proper procedure to log into my console? I've tried to enter data given to me at http://www.zaphu.com/2008/05/30/ubun...-m4a-playback/ It entered the first line of text but not the unwrapped second line. Another line appeared asking my 'neil' login. Tried to enter my password but typed letters wouldn't enter. What do I do?
View 14 Replies
View Related
Feb 14, 2010
I was under the impression that if I have any programs not installed by the package manager, they belong in /usr/local rather than /usr. But if I put the executable in /usr/local/bin, and the jar files into /usr/ local /lib, I get runtime errors about being unable to load the Java classes. So I resorted to putting things in /usr/bin and /usr/lib and it worked fine.Is this something that can only be corrected by compiling differently, or am I missing an installation step?
View 2 Replies
View Related
May 20, 2010
I have just installed the Xubuntu. And I feel that to use it play a mp3 is like kill myself twice.
I try to play it with Exaile, the boxed player with Xbuntu. But it says I need to install some mpeg codecs.
I found so many depends with sudo apt-cache depends.
How to install them? one by one?!
View 1 Replies
View Related
Mar 7, 2011
I am setting up a file server using Ubuntu and want to make sure I set up a folder structure that will last. Where should I be placing everything that I am sharing (Music, Pictures, Videos, etc)? In theory, if I was setting this up on Windows, I would create a folder directly under C: and set up the different areas of sharing under that (not that that approach would be best either).
Based on constructive criticism, the question is rather ambiguous. My question could be restated to ask "Where shouldn't I set this up? Would /usr be an appropriate place to start? Or would /opt be better?
View 2 Replies
View Related
Sep 15, 2010
I am a newbie trying to get my wusb54g adapter that that i took off my old computer and put it on an old sony laptop. The wireless network connections are not the same as I have on my other computer. Have tried refresh but still the same names come up. have can i get the proper names that are on my other computers.
View 3 Replies
View Related
Mar 29, 2010
Under debian i did this:
casey@t400:~/programs$ ls -l
-rw-rw-r-- 1 root root 2071 2010-03-28 05:15 urlgetter.cpp
Then
casey@t400:~/programs$ gedit urlgetter.cpp
and upon attempting to save the file, I get the error
"Could not save[...] You do not have the permissions necessary to save the file."
but I am a member of the group root:
casey@t400:~/programs$ cat /etc/group | grep root
root:x:0:casey
View 2 Replies
View Related
Jan 23, 2010
We are having zebra card printing software, which we have drivers. Recently we encounter the printer solution software company is closed. Their registered keys are not working. Now we download new driver which are working fine. But no proper software to print the cards. Some paid or open source windows or linux base card printing software. The card is regular card like atm, credit card, medical insurance card etc. They are actually plastic card, but no magnetic strip just printing information to be appear.
View 2 Replies
View Related
Sep 8, 2010
i am using fedora 12(32 bit),when i tryed to uninstall program pidgin from system->administration->add/remove programs i got an error message saying tat YOU FAILED TO PROVID PROPER AUTHENTICATION,so i was jst wondering if we can sign in as root through gui.the problem with my pidgin app was that whenever i tryed to start that application, it appears for like 4-5 sec and then disappears! so i thought of reinstalling the pidgin.
View 4 Replies
View Related
Feb 13, 2010
I am a linux noob and that is the reason I want to boot my windows xp by default. Now kubuntu boots first. I've googled how to do this but the topics of other people with the same 'problem' were old or maybe incorrect. Because the official GRUB Ubuntu wiki says you should not change the /boot/grub/grub.cfg file manually. The first line on the .cfg file is also a warning: Do not edit this file. So it continued looking for a proper way to change the boot order. Then I found something about etc/grub.d and also etc/default/grub. The problem is I don't understand how to change the boot order using this.
View 9 Replies
View Related
Jun 3, 2010
Relatively new to Linux, but I'm trying to grasp the proper way to modify the sudoers file. As an example, what would I have to modify in /etc/sudoers to allow a user (say 'user1' for the example) to be able to add/remove software through yum? I'm aware of the fact that I need to use visudo and how to use the vi editor. I've Googled this topic and while I've found a number of pages on the topic, I never see many examples.
View 5 Replies
View Related
Jul 21, 2010
Code:RW-00022: Error: - Unable to create file with proper privileges: JAVA_TOP Mount Point = /media/SAMSUNG/d01/oracle/vis/apps/apps_st/comn/java/classes test using command: su applmgr -c "touch /media/SAMSUNG/d01/oracle/vis/apps/tech_st/10.1.3/appsutil/jdk/test.tst"
touch: cannot touch `/media/SAMSUNG/d01/oracle/vis/apps/tech_st/10.1.3/appsutil/jdk/test.tst': Permission denied
I am trying to install Oracle ebs on my machine and I keep getting the above error.
View 13 Replies
View Related
Mar 4, 2010
it compares two files using md5... if they are same , a corresponding character is output to a text file .. but the problem is it gets appended by default.. is there any way to output in a normal way because the text is a message and it should be of proper format
here is my script
Code:
#!/bin/bash
g=`tail -1 new.txt|head -n 1`
array=( a b c d e f g h i j k l m n o p q r s t u v w x y z )
for((i=1 ; i <$g+1 ; i++))
[code]....
the message is supposed to be hello , i need to get rid of the endlines somehow..
View 2 Replies
View Related
Jul 1, 2010
I will install Slackware 13.1 on my desktop in 50 GB of disk space but I'm not sure about the proper size for the partitions "/" and "/ usr / local". I want to use most of the space for "/ home" partition, so I can keep my data when I upgrade to a newer version (right?)
View 4 Replies
View Related
May 4, 2011
I've recently started using Linux Mint (version 10) on a Dell Mini 1012 netbook. I'm using a loop device to mount a file on a NAS but whenever this loop device is mounted and has been accessed, my machine fails to shutdown.
Firstly I mount a share on the NAS using cifs (the NAS is aimed at Windows machines so doesn't support NFS). I have a sparse file on the share (which I created using Cygwin in Windows, using the dd command).
I used losetup to create a loop device and formatted it as reiserfs.This works and I can successfully use the mount point. I'm using it with Backintime.If I try to shutdown my machine without unmounting the loop device, shutdown hangs.
These messages just keep repeating and the system never shuts down.So I assume the problem is something to do with unmounting the CIFS/loop device.If I unmount the loop device all is fine. I don't need to unmount the cifs share.Any ideas on how to resolve? Should I add a script to run during shutdown (i.e linked from /etc/rc0.d and /etc/rc6.d) to sync and unmount the loop device? Or is there a better solution?
View 1 Replies
View Related
Jul 22, 2010
Whenever execute the below scriptlet with out proper file name it deletes /tmp directory .I guess this is because value of variable a didnt get initialized and there for rm -rf /tmp/ get executed and entire /tmp directory get deleted.How would i avoid any empty variables to be used in script? as this is a classic case of destructive script.
Code:
#!/bin/bash
echo "Enter file to delete from tmp"
[code]....
View 8 Replies
View Related
Jul 28, 2010
Every time kubuntu updates its headers/boot image I get another version on disk in /boot. These also show up in menu choices when I boot. I currently have 7 or 8 versions and would like to get down to three or four.
In the past I just deleted the files of related versions from /boot but is this the preferred method? Is there a better/safer way to get rid of old kernels?
View 1 Replies
View Related
Jan 5, 2011
I just received my Slackware 13.1 & the 'Official Guide to Slackware Linux' book. I know that there is a big learning curve to use Slackware and that is why I purchased it - according to Distrowatch, "...if you learn Slackware, you learn Linux!" But, while I am 'learning Linux', I would still like to have a linux distro installed that would be more of a 'no-brainer'.
So the question is, which distro should I install first, Slackware or say, OpenSuse? I know that if I were going to dual-boot with XP, that XP should be installed first - does order matter for 2 linux distros too? Also, are there any points to remember to do during the installation processes so that I end up with a working, dual-boot computer?
View 7 Replies
View Related
Jun 3, 2010
It seems that selinux has stop weav to sync the bookmarks.I followed the fix code as SELinux suggested,but it can't work.Does anyone know how to solve it?
View 3 Replies
View Related
Mar 18, 2009
I'm trying to find a proper command to move a certain set of files according to date/time range. I am thinking that the command should be something like:
Code:
ls -l | grep 'date/time range' | mv /folder
View 6 Replies
View Related
Dec 21, 2010
Running a Dell XPS/Dimension 630i. It came with "SATA 2 RAID 0 With Dual 500GB Hard Drives." I have installed a new, third non-raided drive and installed Ubuntu on it.
So now I have Windows on the original hard drive and Ubuntu Linux on the new HD. When I get to the boot menu where I can select an OS, if I select windows I get an error: "No such drive, no such disk." Also, strangely in the first place, in order to even get to the bootloader menu I have had to disable ALL ports under the RAID config. Unless I do this, I will just get to a never-ending blinking cursor.
I have tried every conceivable CMOS config and nothing else works. Tried setting port 3 (the new HD w/ Ubuntu) to first hard disk boot priority. Tried disabling all other ports and enabling the Ubuntu HD port and vice versa.
I have some pictures of boot up: first one is strange error i get after messing with CMOS to finally get ubuntu install to work.
Then the boot menu:
Then error:
Also, note that I can actually access all files from the raided Windows drive through Ubuntu.
View 2 Replies
View Related
Mar 1, 2011
I have the following network setup.
* A static IP from my ISP
* A router/modem in my home
* Two machines: MachineA and MachineB connected to the router
Currently, the router is setup so that ports 80, 21, and 22 all forward to ports 80, 21, and 22 on Machine A.
However, I would like to be able to SSH into Machine B as well. What is the best way to accomplish this? I figured I would setup Machine B's SSH server to listed on a random port like 2995. So then I would configure my router so that incoming requests from port 2995 are forwarded to port 2995 on Machine B.
View 2 Replies
View Related
