----- Forwarded message from ----- Date: Sun, 23 Apr 2006 07:17:10 -0700 To: martin f krafft <[EMAIL PROTECTED]>, [EMAIL PROTECTED] Subject: Re: Bug#358428: options to choose newer/larger/older/smaller file to resolve conflict Message-ID: <[EMAIL PROTECTED]> References: <[EMAIL PROTECTED]> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <[EMAIL PROTECTED]> User-Agent: Mutt/1.5.11+cvs20060126 Status: RO
Hello, On Wed, Mar 22, 2006 at 07:15:37PM +0100, martin f krafft wrote: > Package: unison > Version: 2.13.16-5 > Severity: wishlist > > It would be great to get commands that would automatically choose > the newer/older/larger/smaller file to resolve a conflict. > > E.g. if a.tmp/a and b.tmp/a are in conflict, and the first is larger > but older than the second, then: > > a.tmp b.tmp > changed <-?-> changed a [] x > a.tmp : changed file modified on 2006-03-22 at 18:50:15 size > 3 rw-r--r-- > b.tmp : changed file modified on 2006-03-22 at 18:50:18 size > 2 rw-r--r-- > changed <-?-> changed a [] n # date: a <--- b > changed <-?-> changed a [] o # date: a ---> b > changed <-?-> changed a [] + # size: a ---> b > changed <-?-> changed a [] - # date: a <--- b > I will submit this point of view to upstream, but the actual situation is enough for me... Kind regard Sylvain Le Gall ps: i have almost no internet connection at this time, please don't expect a correction soon. ----- End forwarded message ----- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
