Sponsored Content
Top Forums Shell Programming and Scripting Rsync problem versions out of sync Post 302811859 by ajayram on Friday 24th of May 2013 10:58:59 AM
Old 05-24-2013
Rsync problem versions out of sync

Hello,

I have a report which I am writing as a .tex file, and I am editing from two computers (office and home laptop). I use rsync over ssh connection to synchronise between them and all the rssync commands are written in a Shell script.

Code:
#synchronise from office computer to home laptop
rsync -auzv user@host://pathtoremote directory/   /pathtolocaldirectory

#and vice versa
rsync -auzv /pathtolocaldirectory user@host://pathtoremote directory/

I run this code, in a shell script, after finishing some part of the work at either machine.
Now, it turns out that I have edited some portion in my laptop yesterday night, and forgotten to do this synchronisation. and came to work today, and edited the same tex file. I realised the mistake , when the generated pdf showed some old content.

Now , I am stuck. If I go home and run this synchronising commnd, it will overwrite the changes I made in my laptop . Basically I have two versions of the same file.

Is there any way, automatically you can use some shell scripting to see which portions were modified in the laptop, and merge the two versions together,. I know that diff command works to find the difference between two files, but is there some better way to do it, I dont understand very clearly the output of diff, but can rsync help in this ?

I should have used some DropBox which automatically syncs, but anyways, how do I solve this ?
 

10 More Discussions You Might Find Interesting

1. UNIX for Dummies Questions & Answers

rsync problem

Hi, I wanna synchronize all the /etc settings from my previous server to new one. (Both of them are Debian Etch 4.0) I used this command: rsync -r -vz -e ssh someuser@myOldServer:/etc /etc & rsync -avz -e ssh someuser@myOldServer:/etc /etc These commands told me that everything occur perfectly... (6 Replies)
Discussion started by: mjdousti
6 Replies

2. UNIX for Advanced & Expert Users

primary-secondary sync problem

hi guys, i am new to this DNS business and i'm having a problem. the setup is bind 9.2.3 is installed on a sun solaris 8 server and is the primary DNS. men and mice suite is installed on another sun solaris 8 and that is our secondary DNS server. problem is recently the secondary DNS stopped... (0 Replies)
Discussion started by: mbannout
0 Replies

3. Solaris

Sync to Green vs. Separate Sync

Hi all....I have a Sun Ultra2 that I want to use with my PC monitor. I have purchased an adapter that does not work and I was told I need to change my video card setting (if I can) to Separate Sync.....my Monitor product number ends in 1343......I am running SunOS 5.7 ......anyone have any ideas? ... (0 Replies)
Discussion started by: psantinello
0 Replies

4. Shell Programming and Scripting

Compatibility problem of Tk Module in different versions

Hi, I am using Tk module in perl 5.6 and it is working fine. Now when i installed the newer version 5.10.0 then getting error that Tk module not found. But i will have to work on this newer verison only to use some other modules of perl. I want to know why Tk module is not working in newer... (6 Replies)
Discussion started by: kunal_dixit
6 Replies

5. Shell Programming and Scripting

problem with rsync

Hi, I am copying files from one server to the other by rsync utilty. I am giving a list file to the rsync and i am writing it to the log also. The problem is that,rsync is not copying the order in which i have given files and links to the list. I can see it, through the log file. I am giving... (7 Replies)
Discussion started by: vvenu88
7 Replies

6. Red Hat

NTP sync problem

Hi, I have 4 machines and all are NTP configured with same ntp.conf file. But 3 machines are in sync with Time server and 4th machine is not contacting & sync with the NTP server. Please see the below details. # service ntpd stop Stopping ntpd: ... (0 Replies)
Discussion started by: uday123
0 Replies

7. Shell Programming and Scripting

rsync - transactional sync with multiple nodes

Hi Everyone, We have a requirement to sync files with multiple nodes. We need to run the rsync sequentially on each node, if one of the node fails we need to recover the files to previous state in all nodes. I know that we have backup option in rsync which takes the backup of files before... (0 Replies)
Discussion started by: MVEERA
0 Replies

8. Solaris

How to sync without rsync?

rsync for solaris seems to be a spotty beast. It's not installed by default. I facing a problem where I didn't have root access to be able install rsync. I did have ssh access and was able to configure the authorized keys so that no password was required to connect from one server to another. ... (1 Reply)
Discussion started by: abe123
1 Replies

9. UNIX for Dummies Questions & Answers

Having a problem with the time sync from Solaris 10 to VirtualBox

I have a VirtualBox w2008r2 Domain Controller running on a Solaris 10 server. I have the time on the Virtual machine set to Default time sync (bios clock) and the Solaris server set to sync to 0 8,20 * * * /usr/sbin/ntpdate tick.usno.navy.mil tock.usno.navy.mil >> /tmp/ntp.log My problem is... (2 Replies)
Discussion started by: SIFT3R
2 Replies

10. Shell Programming and Scripting

Rsync from remote machine via ssh and sync by uisng find by modified time

Hi I have a requirement to rsync from remote to local machine via ssh and sync files that are changed in last n hours. pgrep to check if no other sync is running pgrep -f rsync.*/opt > /dev/null || rsync --bwlimit=10000 -avz --delete root@X.X.X.X:/var/source/ /opt/dest/ >> /home/log 2>&1... (0 Replies)
Discussion started by: robo
0 Replies
slack.conf(5)							File Formats Manual						     slack.conf(5)

NAME
slack.conf - configuration file for slack DESCRIPTION
The file /etc/slack.conf contains configuration information for slack(8) and its backends. It should contain one keyword-value pair per line, separated by an '=' sign. Keywords must consist solely of capital letters and underscores. Values may take any appropriate format, but must not begin with a space. Comments start with '#', and all text from the '#' to the end of a line is ignored. Trailing whitespace on lines is ignored. Empty lines or lines consisting of only whitespace and comments are ignored. Valid keywords are: SOURCE The master source for slack roles. It can be in one of four forms: o /path/to/dir Use a local directory. o somehost:/path/to/dir Use given directory on a remote host via rsync over SSH. o rsync://somehost/module Use module on a remote rsyncd server (directly over the network). o somehost::module Use the rsync daemon protocol over SSH to the given host. See "USING RSYNC-DAEMON FEATURES VIA A REMOTE-SHELL CONNECTION" in rsync(1) All forms of SOURCE are passed directly to rsync, so you can do things like add "user@" before the host on any remote forms. For more about what rsync can do, see its manual page, of course. For the last form, however, we do a little magic. rsync treats the last two forms equivalently, so we overload the last form by automatically passing "-e ssh" to rsync when we see it. This hack lets us tell slack to use this nice feature of rsync just using the SOURCE config option. ROOT The root filesystem into which to install slack roles. Usually '/'. ROLE_LIST The location of the role list, which lists the roles to be installed by default on each host. This can be a path relative to the source, or can be an entirely separate location if it starts with a slash or a hostname (option- ally preceeded by user@). CACHE A local cache directory, used as a local mirror of the SOURCE. STAGE A local staging directory, used as an intermediate stage when installing files. BACKUP_DIR A directory in which to keep dated backups for rollbacks. EXAMPLE
A typical file might look like this: # slack.conf configuration file SOURCE=slack-master:/slack # source is on a remote # host named "slack-master" ROLE_LIST=slack-master:/roles.conf ROOT=/ CACHE=/var/cache/slack STAGE=/var/lib/slack/stage BACKUP_DIR=/var/lib/slack/backups FILES
/etc/slack.conf SEE ALSO
slack(8), rsync(1) File formats 2005-05-23 slack.conf(5)
All times are GMT -4. The time now is 08:48 PM.
Unix & Linux Forums Content Copyright 1993-2022. All Rights Reserved.
Privacy Policy