Loading ...
Sorry, an error occurred while loading the content.
 

options to choose newer/larger/older/smaller file to resolve conflict

Expand Messages
  • martin f krafft
    http://bugs.debian.org/358428 : Package: unison Version: 2.13.16-5 Severity: wishlist It would be great to get commands that would automatically choose the
    Message 1 of 7 , Mar 23, 2009
      http://bugs.debian.org/358428 :

      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

      --
      .''`. martin f. krafft <madduck@d.o> Related projects:
      : :' : proud Debian developer http://debiansystem.info
      `. `'` http://people.debian.org/~madduck http://vcs-pkg.org
      `- Debian - when you have better things to do than fixing systems
    • Scott Bohler
      Hi Martin, Another one for the user manual. Please check out the -force and -prefer preferences. Scott ... From: unison-users@yahoogroups.com
      Message 2 of 7 , Mar 23, 2009
        Hi Martin,

        Another one for the user manual. Please check out the -force and -prefer preferences.

        Scott


        -----Original Message-----
        From: unison-users@yahoogroups.com [mailto:unison-users@yahoogroups.com] On Behalf Of martin f krafft
        Sent: Monday, March 23, 2009 7:24 AM
        To: unison users list
        Cc: 358428@...
        Subject: [unison-users] options to choose newer/larger/older/smaller file to resolve conflict

        http://bugs.debian.org/358428 :

        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

        --
        .''`. martin f. krafft <madduck@d.o> Related projects:
        : :' : proud Debian developer http://debiansystem.info
        `. `'` http://people.debian.org/~madduck http://vcs-pkg.org
        `- Debian - when you have better things to do than fixing systems
      • martin f krafft
        ... Not quite. First, those only support time-based comparisons, not size-based ones. Second, those need to be passed at the start and they ll be effective for
        Message 3 of 7 , Mar 23, 2009
          also sprach Scott Bohler <sbohler@...> [2009.03.23.1739 +0100]:
          > Another one for the user manual. Please check out the -force and
          > -prefer preferences.

          Not quite.

          First, those only support time-based comparisons, not size-based
          ones.

          Second, those need to be passed at the start and they'll be
          effective for all. the -*partial variants are a bit better, but what
          I really want is the option to use those options interactively on
          a per-file basis.

          Thanks,

          --
          .''`. martin f. krafft <madduck@d.o> Related projects:
          : :' : proud Debian developer http://debiansystem.info
          `. `'` http://people.debian.org/~madduck http://vcs-pkg.org
          `- Debian - when you have better things to do than fixing systems

          "even if you persuade me, you won't persuade me."
          -- aristophanes
        • Alan Schmitt
          ... There are ways to prefer newer files, but not larger ones at the moment (see the -prefer and -force options). Alan
          Message 4 of 7 , Mar 23, 2009
            On 23 mars 09, at 12:24, martin f krafft wrote:

            > http://bugs.debian.org/358428 :
            >
            > 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.

            There are ways to prefer newer files, but not larger ones at the
            moment (see the -prefer and -force options).

            Alan
          • Benjamin Pierce
            The -force and -prefer switches do some of this. Keyboard commands for doing it to specific files would be nice. Patches gratefully accepted. :-) - Benjamin
            Message 5 of 7 , Mar 23, 2009
              The -force and -prefer switches do some of this. Keyboard commands
              for doing it to specific files would be nice.

              Patches gratefully accepted. :-)

              - Benjamin


              On Mar 23, 2009, at 8:24 AM, martin f krafft wrote:

              > http://bugs.debian.org/358428 :
              >
              > 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
              >
              > --
              > .''`. martin f. krafft <madduck@d.o> Related projects:
              > : :' : proud Debian developer http://debiansystem.info
              > `. `'` http://people.debian.org/~madduck http://vcs-pkg.org
              > `- Debian - when you have better things to do than fixing systems
            • martin f krafft
              ... I d have to learn a new programming language first. :( -- ... `. ` ` http://people.debian.org/~madduck http://vcs-pkg.org `- Debian - when you have
              Message 6 of 7 , Mar 23, 2009
                also sprach Benjamin Pierce <bcpierce@...> [2009.03.23.1812 +0100]:
                > The -force and -prefer switches do some of this. Keyboard commands for
                > doing it to specific files would be nice.
                >
                > Patches gratefully accepted. :-)

                I'd have to learn a new programming language first. :(

                --
                .''`. martin f. krafft <madduck@d.o> Related projects:
                : :' : proud Debian developer http://debiansystem.info
                `. `'` http://people.debian.org/~madduck http://vcs-pkg.org
                `- Debian - when you have better things to do than fixing systems
              • Benjamin Pierce
                ... But maybe there are other people out there that might feel like hacking... :-) - B
                Message 7 of 7 , Mar 23, 2009
                  >> The -force and -prefer switches do some of this. Keyboard commands
                  >> for
                  >> doing it to specific files would be nice.
                  >>
                  >> Patches gratefully accepted. :-)
                  >
                  > I'd have to learn a new programming language first. :(

                  But maybe there are other people out there that might feel like
                  hacking... :-)

                  - B
                Your message has been successfully submitted and would be delivered to recipients shortly.