Re: Not creating current backups; unable to get merge; user manual inaccuracies
Yang <4i4yraj02 <at> sneakemail.com>
2007-07-06 18:42:33 GMT
Any help?
Thanks,
Yang
On 6/19/07, Yang 4i4yraj02-at-sneakemail.com |unison|
<...> wrote:
> Setting "backup" does not solve the problem.
>
> I tried it out on several machines and always see this behavior.
> (Just merge a couple of times - it won't work beyond the second.)
>
> I do not know OCaml, sorry.
>
> Yang
>
> On 6/13/07, Benjamin Pierce bcpierce-at-cis.upenn.edu |unison|
> <...> wrote:
> > Hi Yang,
> >
> > I'm traveling at the moment -- may take a few days to look carefully
> > at this.
> >
> > For now, have you tried setting "backup" in addition to "backupcurrent"?
> >
> > The easiest way to answer all your questions about the backup / merge
> > logic is to point you to the function "merge" in files.ml in the
> > sources. At least at a high level, what the code is doing should be
> > reasonably easy to follow.
> >
> > Regards,
> >
> > - Benjamin
> >
> >
> > On Jun 10, 2007, at 7:40 AM, Yang wrote:
> >
> > > Unison (using 2.27.29) isn't backing up my current versions, and it
> > > also doesn't agree with my merge script.
> > >
> > > For the former, I specified backupcurrent, but while I do see the
> > > initial versions in my central $UNISONBACKUPDIR (from the very first
> > > run of unison), I don't see anything after that being reflected in the
> > > backup. Do I need to explicitly create NEWARCH to update the backup?
> > >
> > > For the latter, I'm simply trying to reproduce the 2-way diff behavior
> > > I used to use (when there is no common archive version with which to
> > > diff3). Specifically, in older versions of unison, I could specify
> > > "editor = vim" and it would bring up the editor for me to manually
> > > merge.
> > >
> > > This is my .prf:
> > >
> > > backupcurrent = Name *
> > > backuplocation = central
> > >
> > > merge = Name * -> unison-merge CURRENTARCHOPT CURRENT1 CURRENT2 NEW
> > >
> > > addprefsto = common
> > >
> > > ignore = Name .*.swp
> > > ignore = Name *~
> > > ignore = Name .*~
> > > ignore = Name *.pyc
> > >
> > > This is unison-merge:
> > >
> > > #!/usr/bin/env bash
> > >
> > > case $# in
> > > 3 ) CURRENTARCHOPT='' ;;
> > > 4 ) CURRENTARCHOPT="$1" ; shift ;;
> > > esac
> > >
> > > CURRENT1="$1"
> > > CURRENT2="$2"
> > > NEW="$3"
> > >
> > > if [[ ! -z "$CURRENTARCHOPT" ]] ; then
> > > diff3 -m "$CURRENT1" "$CURRENTARCHOPT" "$CURRENT2" > "$NEW"
> > > else
> > > diff -DREMOTEFILE "$CURRENT1" "$CURRENT2" > "$NEW"
> > > "${EDITOR:-vim}" "$NEW"
> > > fi
> > >
> > > Do most unison users have crazy backup scripts like this? I find the
> > > examples given in the manual to be rather unrealistic. For instance,
> > > with the behavior I'm seeing,
> > >
> > > merge = Name *.txt -> diff3 CURRENT1 CURRENTARCH CURRENT2 -m > NEW
> > >
> > > would only work the first time, as the ARCH doesn't get updated. (Or
> > > maybe the behavior I'm seeing is a bug.)
> > >
> > > Thanks in advance for any help!
> > >
> > >
> > >
> > > Yahoo! Groups Links
> > >
> > >
> > >
> >
> >
>
>
>
> Yahoo! Groups Links
>
>
>
>
Yahoo! Groups Links
<*> To visit your group on the web, go to:
http://groups.yahoo.com/group/unison-users/
<*> Your email settings:
Individual Email | Traditional
<*> To change settings online go to:
http://groups.yahoo.com/group/unison-users/join
(Yahoo! ID required)
<*> To change settings via email:
mailto:unison-users-digest <at> yahoogroups.com
mailto:unison-users-fullfeatured <at> yahoogroups.com
<*> To unsubscribe from this group, send an email to:
unison-users-unsubscribe <at> yahoogroups.com
<*> Your use of Yahoo! Groups is subject to:
http://docs.yahoo.com/info/terms/