From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F2F6A158041 for ; Fri, 29 Mar 2024 11:28:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D610E2A7C; Fri, 29 Mar 2024 11:28:00 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 580FFE2A78 for ; Fri, 29 Mar 2024 11:27:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1711711673; x=1712316473; i=warp_7@gmx.de; bh=MEvR19bV4/DAe0nkt83pR778sblVDNQNDQt0/6EgO+A=; h=X-UI-Sender-Class:Date:From:To:Subject:References:In-Reply-To; b=MxSZR+K+MKO9pmHqcBF+VDJwgk2q1SGdN/v6gFyBLLGt+/hmjsiICJeL6I2vZ27X B6xuxZMsQrP2CUccKG+4LXvpeYIKzJ1hmmrLecc8du4scKV7TVxOSLMBNIUKHuQbT gJTIO8oGfB3YNyZOp+Lw+29JxoJJs70ndSCJ3dBZwG/Zw3W6asPDq2hLbqR0XgLPr uKbrX1RA2jspeQn3jq30AHGGBbohU7ITukfWtKqI1sGpFAIXo+Bs4gxEUqGKDEA93 Y4OLa6GlkZNNJlWn0TPIn1JkVbYm6rsQxogaYGHLtBSveuOudXtI+tJve18/tn9AI jRgcJc377lGc+SK8/g== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from schatulle ([87.122.76.8]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MSt8W-1sH9jL0dFm-00UIRv for ; Fri, 29 Mar 2024 12:27:53 +0100 Date: Fri, 29 Mar 2024 12:27:51 +0100 From: Frank Steinmetzger To: gentoo-user@lists.gentoo.org Subject: Re: [gentoo-user] How to synchronise between 2 locations Message-ID: Mail-Followup-To: gentoo-user@lists.gentoo.org References: <12420309.O9o76ZdvQC@persephone> <464542cc-195a-4393-a154-bb559bdea759@yahoo.com> <2333770.ElGaqSPkdT@persephone> <2d3870ae-5055-4b17-84f3-c3b6643d0dd6@yahoo.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@lists.gentoo.org Reply-to: gentoo-user@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="sjl1K2sWbWvdxDsJ" Content-Disposition: inline In-Reply-To: <2d3870ae-5055-4b17-84f3-c3b6643d0dd6@yahoo.com> User-Agent: Mutt 2.2.13; VIM - Vi IMproved 9.1 X-Provags-ID: V03:K1:4wr+8Fbo5qMXZ6sP7CRHCaN5S9TIlT3q+3S608oI+ZnN4n/WT5f uxrujQs8OVZ/k1THY4ZRT030ahboSffoR5vuIFD5lh1l3j6993jHdPvZ0ucC3KaulDcX6XQ da64A0IckuHdX1wkEUgZJJ7Yv47N+BJfpwg1OoaeFqVvvdvHYNU7hMzR/t14ak7by/2uryd bSdb0Vb9CbKusvMShbOng== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:QPkm3WPpdlI=;Wx60qWFqnJoMxRhyDSakpM8Jjm5 1lphpKdbajCE1R/bZPptguuFD8SBPBa2Mz0QhiY7hd011aAvLLGmYHGtDAVk9l0I3FcZO2EXj JwZU1MGjBHq99+hv4AYEkCnznMz4GcEQ+DniUO6FTZH4miH1GoM7+RlcJmnUVmODUro8dvmY8 6fcqMc8gT/yS/VwsDXcz8nHRgLbpmo77NKAL5lcXt5vjePLIY0tSSiMoa1uNfyOSdm3Bydtzn 5oJeTqYumFr1VDJoROftfqJvEEuxLYImYZf4v6qg6AK3yVZYRuk/Pu7SGg0S9ODH96TIuTBFn 0G0Rm+GGSL7tdKN3LeksdR27b11bk+AcxJB14G5nfoy5X9UacEInljIE9qrFv9MDtOCUQi2Fp s/0Z4c4sWuREW/Xz/+NAHrmYCLqgxfeeTmQ3fSl6VRZGFjggP7rlV5UFQMH+m7jft5qc1/gzA ts7sozXehttjCZeHqOkitUiNpt7yPx2gXnz0hty0p5EO+LzKwG4tnNLdOycMcjZPV0Hge8bjj mHhQrkmGz1PhFEDgvksFJ6ogVxMYmVbli2kohhMhUO93ubt0Gj4MRqSuY5C8Ru0crJGQReRAO GqEMmDBliGo4W/KoCA12Vqzbw6iK4/ddVtQRXTJl6yDs54LxEgNexiVzGct0hOMWPVDolkjTH 9q0mfznC8kGh5FkuxGgeaJk02Ezfxe/d8+8jOgVyAZUEvNOttg23G1+WbPL9mR2eK+ZoWYeFr aauQFOxm2ClWvlp84VDDkpKMewV/e2xgQ6WsCuC/6www/3vOZUANyyeBri5Z8DsgYx7dBwxyy N/olWkmW5uVLOsr+4r1MNWml/zf6eGsWwPysxQpqvT9DM= X-Archives-Salt: a53595cd-ab06-4910-8f21-be25f05e9c8a X-Archives-Hash: 4f03cea5c6a71fcf41e8a4bd9f35786c --sjl1K2sWbWvdxDsJ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Am Thu, Mar 28, 2024 at 05:33:43PM +0100 schrieb ralfconn: > Il 28/03/24 07:30, J. Roeleveld ha scritto: > > > Unison creates a local index of all files it syncronised. So when you= move a > > > file around on one end, Unison will notice that because the file at t= he new > > > location has the same hash as the file at the old location. As a resu= lt, it > > > does not transmit the file anew to the remote host, but instead copie= s it > > > locally on the remote host. > > >=20 > > > Since Unison uses ssh underneath, you can use ssh=E2=80=99s transpare= nt compression > > > to speed up the transfer. > > Unison sounds interesting. How does it handle conflicts (eg, file is ch= anged on > > both sides?) > >=20 > I use Unison GUI on one of the two machines (on the other peer it's just a > program invoked from the ssh). When the analysis is complete, the GUI sho= ws > what it would do to sync the machines, indicating the conflicts and giving > you the chance to choose what to do. >=20 > I believe it can be used from the command line or maybe even in batch mode > instead of GUI but I never did it that way. You can set up a merge command to solve conflicts on the cmdline, such as= =20 vimdiff. But when I set that, it blocks the GUI. Maybe I did something wron= g=20 with the setup. Anyways, when I get a conflict, I make a backup of the file= =20 locally, overwrite it with the remote and then do a conflict resolution wit= h=20 vim. In my every-day workflow, I usually only get conflicts in text files (logs,= =20 notes, and so on). Binary conflicts are rare and usually due to recent=20 actions, such as editing an image or music file. In that case I can decide= =20 on a per-case-basis which version to keep. --=20 Gr=C3=BC=C3=9Fe | Greetings | Salut | Qapla=E2=80=99 Please do not share anything from, with or about me on any social network. How does the Heisenberg compensator work? =E2=80=93 Thank you, fine. --sjl1K2sWbWvdxDsJ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEVbE9o2D2lE5fhoVsizG+tUDUMMoFAmYGpbcACgkQizG+tUDU MMpRNxAAsxI6C3GDxuhn02umRxFh9DE3xvKbstxVQ1KKC5WMcqP2iur6AveM1o4K ZwbmejNo51NBXNemMEzLOsOXZow8JGbb0VXdhNMiZKnoPhMHwgHJ8Q/Pxoqmqa6l hSL3Yi8MFpEZRLRBjdkA/f+oDF3aezLgl/nBpBlPVPWxDlp3kX+8x6SKXbGeg/wG PCYchmHFU1gKqD8A+Od0watLaJwrvbji3mVcSiYHZ1VW2pDHmqqGll8NwNXhDYYd CnpNKbgwA7EHcl2XkbnIjZfgMZJ9zdRfrTHitTbihIWt7R6av/AgSlbBycK0Jsjp k9vFAzUHE4cmeE1K3yN3IJzrWHtT9cTx8AN6zof9KuFe0zGs6rxLhrVAB+0snWoP ZIrQP/sw/Qb57bc1zJb/peQQhCeGzWX40cZMvQk0GGq7NJSaBzUZ89U0b81zECCt 41AewZaVHyz+MqKuE39dgegGVZ94tTSVUzMJnATpdKw3mLLy/QdA86EYZqi7D9Mx yUzmsSWJz1AeZtZs7HV1W/PDJlpFp9SZIi7x7HK5czQeOPtPLKbExZIfyn5U7BGc 4/8hhE3MACzxmWu+n3GUNIzdyakFaVbXUraxnoqKASYSAHpxt70Pq51WlLuO+Huq x4ZaUc1Z2itBDg7G0XgfrfW4VwklA19i/yKkPmZfhYYx1QTuuq0= =31YE -----END PGP SIGNATURE----- --sjl1K2sWbWvdxDsJ--