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
RoPkg::Rsync::LogParser(3pm)				User Contributed Perl Documentation			      RoPkg::Rsync::LogParser(3pm)

NAME
RoPkg::Rsync::LogParser - a rsync log parser class SYNOPSIS
#!/usr/bin/perl use strict; use warning; sub main { my $lp = new RoPkg::Rsync::LogParser( type => 'client' ); $lp->Parse('/tmp/debian-log.txt'); } main(); Short description RoPkg::Rsync::LogParser is a class used to parse (for the moment) client side rsync logs. Using this class you can extract the transfered files, symlinks created, directories, total number of files, transfered bytes, speed of transfer etc. LogParser support list filter trough probes (used by many projects to verify the mirrors). The primary use of this class is inside Simba, but can be used without problems in any other project who needs a rsync client log parser. METHODS
new(hash) Constructor of the class. When creating a new class instance you must provide the type of log: client or server . For the moment only the client parsing routines are defined. Log($raw_log) Get/Set the raw rsync log. With no parameters, the get behaviour is selected. If a parameter is present (and valid) the method acts as a Set method. Probes(@probes_list) Get/Set the raw probes list. If no parameter is present, the method returns the number of probes defined (0 if none). If a list of probes is given, the list is added to the existing list of probes. Parse($filename) Parse a rsync client log. If no filename is specified, the method parses the log previsiously set with Log() method. Please take extra care with the filename. If it does not exists, or is not a file a exception will be raised (Param::Wrong and File::Open). Files() In scalar context returns the number of transfered files (filtered by probes list). In list context, returns the list of transfered files. RealFiles() In scalar context returns the number of transfered files. In list context, returns the list of transfered files. Deleted() In scalar context returns the number of deleted files (filtered by probes list). In list context, returns the list of deleted files. RealDeleted() In scalar context returns the number of deleted files. In list context, returns the list of deleted files. Speed() Returns the speed (as reported by rsync [in bytes/sec]) of the transfer. Size() Returns the size of the synced content. TransfData() Returns the total number of bytes transfered during the sync session Symlinks() In scalar context returns the number of symlinks (filtered by probes list). In list context, returns the list of symlinks. RealSymlinks() In scalar context returns the number of symlinks. In list context, returns the list of symlinks. PREREQUISITES
RoPkg::Utils requires perl 5.008 or later and RoPkg::Exceptions class. From CPAN, you need the Scalar::Util module. At build time Test::More is required for tests (if you don't plan to use the tests ignore this dependency). SEE ALSO
RoPkg::Rsync::Node RoPkg::Rsync::ConfFile RoPkg::Exceptions AUTHOR
Subredu Manuel <diablo@iasi.roedu.net> LICENSE
Copyright (C) 2005 Subredu Manuel. All Rights Reserved. This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. The LICENSE file contains the full text of the license. perl v5.8.8 2006-06-09 RoPkg::Rsync::LogParser(3pm)
All times are GMT -4. The time now is 09:32 AM.
Unix & Linux Forums Content Copyright 1993-2022. All Rights Reserved.
Privacy Policy