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

-- System Information:
Debian Release: testing/unstable
  APT prefers stable
  APT policy: (700, 'stable'), (600, 'testing'), (98, 'unstable'), (1, 
'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: LANG=en_GB, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)

Versions of packages unison depends on:
ii  libc6                         2.3.6-2    GNU C Library: Shared libraries an

Versions of packages unison recommends:
ii  openssh-client [ssh-client]   1:4.2p1-7  Secure shell client, an rlogin/rsh

-- no debconf information

-- 
Please do not send copies of list mail to me; I read the list!
 
 .''`.     martin f. krafft <[EMAIL PROTECTED]>
: :'  :    proud Debian developer and author: http://debiansystem.info
`. `'`
  `-  Debian - when you have better things to do than fixing a system

Attachment: signature.asc
Description: Digital signature (GPG/PGP)

Reply via email to