From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@newcastle.ac.uk (Phillip Lord) Newsgroups: gmane.emacs.help Subject: Re: In defense of Customize [was: Trying to right-align my window on startup] Date: Thu, 30 Jan 2014 09:59:02 +0000 Message-ID: <87sis5rdsp.fsf@newcastle.ac.uk> References: <3cec217d-8adb-4e6c-b239-eff0c8b520c9@googlegroups.com> <6hrwqhkjfv6.fsf@sap.com> <87zjmgosx7.fsf@nl106-137-194.student.uu.se> <871tzrukc8.fsf@newcastle.ac.uk> <87wqhisp87.fsf@newcastle.ac.uk> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1391075962 26343 80.91.229.3 (30 Jan 2014 09:59:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 30 Jan 2014 09:59:22 +0000 (UTC) Cc: help-gnu-emacs@gnu.org To: Stefan Monnier Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Thu Jan 30 10:59:28 2014 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W8oP9-000189-BX for geh-help-gnu-emacs@m.gmane.org; Thu, 30 Jan 2014 10:59:27 +0100 Original-Received: from localhost ([::1]:47272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8oP9-0000Y6-1F for geh-help-gnu-emacs@m.gmane.org; Thu, 30 Jan 2014 04:59:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8oOt-0000Wk-FP for help-gnu-emacs@gnu.org; Thu, 30 Jan 2014 04:59:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8oOo-0008T6-KX for help-gnu-emacs@gnu.org; Thu, 30 Jan 2014 04:59:11 -0500 Original-Received: from cheviot12.ncl.ac.uk ([128.240.234.12]:43319) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8oOo-0008Sy-C5 for help-gnu-emacs@gnu.org; Thu, 30 Jan 2014 04:59:06 -0500 Original-Received: from smtpauth-vm.ncl.ac.uk ([10.8.233.129]) by cheviot12.ncl.ac.uk with esmtp (Exim 4.63) (envelope-from ) id 1W8oOm-0005XS-B4; Thu, 30 Jan 2014 09:59:04 +0000 Original-Received: from localhost (jangai.ncl.ac.uk [10.66.67.223]) (authenticated bits=0) by smtpauth-vm.ncl.ac.uk (8.13.8/8.13.8) with ESMTP id s0U9x3oe017602 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Thu, 30 Jan 2014 09:59:04 GMT In-Reply-To: (Stefan Monnier's message of "Wed, 29 Jan 2014 13:26:02 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 128.240.234.12 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:95788 Archived-At: Stefan Monnier writes: >>> I prefer using DVCS to sync up my files. Started doing that when CVS >>> acquired its "remote access" functionality. >> I tried that, but I dislike the explicit commit > > For sync purpose, I have a script which does "commit+merge". > It's really the same as unison, except I have a history of changes, and > better conflict resolution. Commits don't have any logical meaning, nor > "commit log" message in that case. That's an interesting idea, and I hadn't thought of it. In general, I am not too worried about conflict resolution, since my work practices are aimed at not getting conflicts. So, for example, I unison my ~/Mail and use nnml. A DVCS resolution is not going to help there because it is the conflict is between files not inside the content of files. One day I need to write a Gnus backend which doesn't use sequential file numbers (perhaps a time stamp would work) -- these would then merge cleanly automatically when read at both ends. I suspect "one day" is never going to happen. I also sync quite large binary files (music, photos and occasionally isos). DVCS I think wouldn't not be ideal here, since you'd get a 2x increase in size, and deletion wouldn't decrease that. >> I actually [sync?] many of my DVCS working repos between machines; > > For things where I use DVCS for non-sync purpose, I typically use > a separate "work-mess" branch which I sync via "commit+merge" as above > without caring about commit messages or commit granularity. And when > the work is ready, I move it manually onto a real branch where I "commit > properly". Good idea also! Phil