[prev in list] [next in list] [prev in thread] [next in thread]
List: unison-users
Subject: Re: [unison-users] Not creating current backups; unable to get merge; user manual inaccuracies
From: Benjamin Pierce <bcpierce () cis ! upenn ! edu>
Date: 2007-10-05 0:28:42
Message-ID: 5DDAC9F6-4DCA-407D-8C04-171EAC5C3455 () cis ! upenn ! edu
[Download RAW message or body]
Hi Yang,
I finally got a chance to track this down. As you said, the new ARCH
wasn't getting stashed away after the merge. I (believe I've) fixed
this in both the current developer version (2.28) and the current
beta version (2.27).
Regards,
- Benjamin
On Jun 10, 2007, at 2: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
>
>
>
[Attachment #3 (text/html)]
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" \
"http://www.w3.org/TR/html4/strict.dtd"> <html>
<head>
</head>
<!-- Network content -->
<body style="background-color: #ffffff;">
<!--~-|**|PrettyHtmlStartT|**|-~-->
<div id="ygrp-mlmsg" style="width:655px; position:relative;">
<div id="ygrp-msg" style="width: 490px; padding: 0 15px 0 0; float:left; \
z-index:1;"> <!--~-|**|PrettyHtmlEndT|**|-~-->
<div id="ygrp-text">
<p>Hi Yang,<br>
<br>
I finally got a chance to track this down. As you said, the new ARCH <br>
wasn't getting stashed away after the merge. I (believe I've) fixed <br>
this in both the current developer version (2.28) and the current <br>
beta version (2.27).<br>
<br>
Regards,<br>
<br>
- Benjamin<br>
<br>
On Jun 10, 2007, at 2:40 AM, Yang wrote:<br>
<br>
> Unison (using 2.27.29) isn't backing up my current versions, and it<br>
> also doesn't agree with my merge script.<br>
><br>
> For the former, I specified backupcurrent, but while I do see the<br>
> initial versions in my central $UNISONBACKUPDIR (from the very first<br>
> run of unison), I don't see anything after that being reflected in the<br>
> backup. Do I need to explicitly create NEWARCH to update the backup?<br>
><br>
> For the latter, I'm simply trying to reproduce the 2-way diff behavior<br>
> I used to use (when there is no common archive version with which to<br>
> diff3). Specifically, in older versions of unison, I could specify<br>
> "editor = vim" and it would bring up the editor for me to manually<br>
> merge.<br>
><br>
> This is my .prf:<br>
><br>
> backupcurrent = Name *<br>
> backuplocation = central<br>
><br>
> merge = Name * -> unison-merge CURRENTARCHOPT CURRENT1 CURRENT2 NEW<br>
><br>
> addprefsto = common<br>
><br>
> ignore = Name .*.swp<br>
> ignore = Name *~<br>
> ignore = Name .*~<br>
> ignore = Name *.pyc<br>
><br>
> This is unison-merge:<br>
><br>
> #!/usr/bin/env bash<br>
><br>
> case $# in<br>
> 3 ) CURRENTARCHOPT=<wbr>'' ;;<br>
> 4 ) CURRENTARCHOPT=<wbr>"$1" ; shift ;;<br>
> esac<br>
><br>
> CURRENT1="$1"<br>
> CURRENT2="$2"<br>
> NEW="$3"<br>
><br>
> if [[ ! -z "$CURRENTARCHOPT" ]] ; then<br>
> diff3 -m "$CURRENT1" "$CURRENTARCHOPT" \
"$CURRENT2" > "$NEW"<br> > else<br>
> diff -DREMOTEFILE "$CURRENT1" "$CURRENT2" > \
"$NEW"<br> > "${EDITOR:-vim}<wbr>" "$NEW"<br>
> fi<br>
><br>
> Do most unison users have crazy backup scripts like this? I find the<br>
> examples given in the manual to be rather unrealistic. For instance,<br>
> with the behavior I'm seeing,<br>
><br>
> merge = Name *.txt -> diff3 CURRENT1 CURRENTARCH CURRENT2 -m > NEW<br>
><br>
> would only work the first time, as the ARCH doesn't get updated. (Or<br>
> maybe the behavior I'm seeing is a bug.)<br>
><br>
> Thanks in advance for any help!<br>
><br>
><br>
><br>
> Yahoo! Groups Links<br>
><br>
><br>
><br>
<br>
</p>
</div>
<!--~-|**|PrettyHtmlStart|**|-~-->
<span width="1" style="color: white;">__._,_.___</span>
<!-- Start the section with Message In topic -->
<div id="ygrp-actbar">
<span class="left">
<a href="http://groups.yahoo.com/group/unison-users/message/6404;_ylc=X3oDMT \
MzY2txaXA5BF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEbXNnSWQDNjY0NwRzZWMDZnRyBHNsawN2dHBjBHN0aW1lAzExOTE1NDQxMDAEdHBjSWQDNjQwNA--">
Messages in this topic </a> (<span class="bld">0</span>)
</span>
<a href="http://groups.yahoo.com/group/unison-users/post;_ylc=X3oDMTJvcTcybXAw \
BF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEbXNnSWQDNjY0NwRzZWMDZnRyBHNsawNycGx5BHN0aW1lAzExOTE1NDQxMDA-?act=reply&messageNum=6647">
<span class="bld">
Reply </span> (via web post)
</a> |
<a href="http://groups.yahoo.com/group/unison-users/post;_ylc=X3oDMTJkNjlrY2k3 \
BF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDbnRwYwRzdGltZQMxMTkxNTQ0MTAw" \
class="bld"> Start a new topic </a>
</div>
<!------- Start Nav Bar ------>
<!-- |**|begin egp html banner|**| -->
<div id="ygrp-vitnav">
<a href="http://groups.yahoo.com/group/unison-users/messages;_ylc=X3oD \
MTJkamdqa3NvBF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDbXNncwRzdGltZQMxMTkxNTQ0MTAw">Messages</a> \
| <a href="http://groups.yahoo.com/group/unison-users/database;_ylc=X3o \
DMTJiaGc1aG12BF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDZGIEc3RpbWUDMTE5MTU0NDEwMA--">Database</a> \
</div>
<!-- |**|end egp html banner|**| -->
<!-- Do not have place to put it yet -->
<div id="ygrp-grft">
</div>
<!-- yahoo logo -->
<!-- |**|begin egp html banner|**| -->
<div id="ygrp-ft">
<a href="http://groups.yahoo.com/;_ylc=X3oDMTJjcXJrMDR2BF9TAzk3MzU5NzE0BGdycElkA \
zQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDZ2ZwBHN0aW1lAzExOTE1NDQxMDA-">
<img src="http://us.i1.yimg.com/us.yimg.com/i/yg/img/logo/ma_grp_160.gif" \
height="15" width="106" border="0" alt="Yahoo! Groups"></a> <br> <a \
href="http://groups.yahoo.com/group/unison-users/join;_ylc=X3oDMTJla2U5ajE4BF9TAzk3MzU \
5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDc3RuZ3MEc3RpbWUDMTE5MTU0NDEwMA--">Change \
settings via the Web</a> (Yahoo! ID required) <br> Change settings via email: <a \
href="mailto:unison-users-digest@yahoogroups.com?subject=Email Delivery: \
Digest">Switch delivery to Daily Digest</a> | <a href = \
"mailto:unison-users-traditional@yahoogroups.com?subject=Change Delivery Format: \
Traditional">Switch format to Traditional</a> <br>
<a href="http://groups.yahoo.com/group/unison-users;_ylc=X3oDMTJjcmliMHZiBF9TAzk \
3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDaHBmBHN0aW1lAzExOTE1NDQxMDA-">
Visit Your Group
</a> |
<a href="http://docs.yahoo.com/info/terms/">
Yahoo! Groups Terms of Use </a> |
<a href="mailto:unison-users-unsubscribe@yahoogroups.com?subject=">
Unsubscribe </a>
</div> <!-- |**|end egp html banner|**| -->
</div> <!-- ygrp-msg -->
<!-- Sponsor -->
<!-- |**|begin egp html banner|**| -->
<div id="ygrp-sponsor" style="width:140px;float: left; clear: none; margin-left: \
5px; background:white; margin-bottom:25px ;position:absolute; top:0; right: 0;"> \
<!-- Network content -->
<!-- Start vitality -->
<div id="ygrp-vital">
<div id="vithd">Recent Activity</div>
<ul style="list-style-type:none; padding: 0; margin: 2px 0;">
<li style="clear: both;">
<div class="ct" style="float: right;"><span \
style="display:none"> </span>9</div> <div class="cat"><a \
href="http://groups.yahoo.com/group/unison-users/members;_ylc=X3oDMTJlZ2JvM3FmBF9TAzk3 \
MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA3Z0bARzbGsDdm1icnMEc3RpbWUDMTE5MTU0NDEwMA--">New \
Members</a></div> </li>
</ul>
<a href="http://groups.yahoo.com/group/unison-users;_ylc=X3oDMTJkYWxocG12B \
F9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA3Z0bARzbGsDdmdocARzdGltZQMxMTkxNTQ0MTAw">
Visit Your Group </a>
</div>
<div id="hd">SPONSORED LINKS</div>
<div id="ov">
<ul>
<li><a \
href="http://groups.yahoo.com/gads;_ylc=X3oDMTJicjN2YjFxBF9TAzk3MzU5NzE0BF9wAzEEZ3JwSW \
QDNDc5NzY3BGdycHNwSWQDMTcwNTAwNDcyNgRzZWMDc2xtb2QEc3RpbWUDMTE5MTU0NDEwMQ--?t=ms&k=Comp \
uter+telephony&w1=Computer+telephony&w2=Portable+computer&w3=Communication+and+network \
ing&w4=Computer+telephony+integration&w5=Computer+telephony+integration+cti&c=5&s=157&g=2&.sig=cI6nn3xJEMfs32JxC85dcw">Computer \
telephony</a></li> <li><a \
href="http://groups.yahoo.com/gads;_ylc=X3oDMTJiMnNuM2I3BF9TAzk3MzU5NzE0BF9wAzIEZ3JwSW \
QDNDc5NzY3BGdycHNwSWQDMTcwNTAwNDcyNgRzZWMDc2xtb2QEc3RpbWUDMTE5MTU0NDEwMQ--?t=ms&k=Port \
able+computer&w1=Computer+telephony&w2=Portable+computer&w3=Communication+and+networki \
ng&w4=Computer+telephony+integration&w5=Computer+telephony+integration+cti&c=5&s=157&g=2&.sig=A9nME5kYoIGc_7MMuf9LCw">Portable \
computer</a></li> <li><a \
href="http://groups.yahoo.com/gads;_ylc=X3oDMTJibjJnNGc1BF9TAzk3MzU5NzE0BF9wAzMEZ3JwSW \
QDNDc5NzY3BGdycHNwSWQDMTcwNTAwNDcyNgRzZWMDc2xtb2QEc3RpbWUDMTE5MTU0NDEwMQ--?t=ms&k=Comm \
unication+and+networking&w1=Computer+telephony&w2=Portable+computer&w3=Communication+a \
nd+networking&w4=Computer+telephony+integration&w5=Computer+telephony+integration+cti&c=5&s=157&g=2&.sig=poO9-FF9_XSISK_QkOpxjw">Communication \
and networking</a></li> <li><a \
href="http://groups.yahoo.com/gads;_ylc=X3oDMTJiN2xmZzIxBF9TAzk3MzU5NzE0BF9wAzQEZ3JwSW \
QDNDc5NzY3BGdycHNwSWQDMTcwNTAwNDcyNgRzZWMDc2xtb2QEc3RpbWUDMTE5MTU0NDEwMQ--?t=ms&k=Comp \
uter+telephony+integration&w1=Computer+telephony&w2=Portable+computer&w3=Communication \
+and+networking&w4=Computer+telephony+integration&w5=Computer+telephony+integration+cti&c=5&s=157&g=2&.sig=yXuMgjU5NHyTPgXuW-pLvQ">Computer \
telephony integration</a></li> <li><a \
href="http://groups.yahoo.com/gads;_ylc=X3oDMTJiOTFiOHFiBF9TAzk3MzU5NzE0BF9wAzUEZ3JwSW \
QDNDc5NzY3BGdycHNwSWQDMTcwNTAwNDcyNgRzZWMDc2xtb2QEc3RpbWUDMTE5MTU0NDEwMQ--?t=ms&k=Comp \
uter+telephony+integration+cti&w1=Computer+telephony&w2=Portable+computer&w3=Communica \
tion+and+networking&w4=Computer+telephony+integration&w5=Computer+telephony+integration+cti&c=5&s=157&g=2&.sig=NV2FmisAN7KDsrwTM3i6VA">Computer \
telephony integration cti</a></li> </ul>
</div>
<!-- Network content -->
<div id="nc">
<div class="ad">
<div id="hd1">Yahoo! Finance</div>
<p><a href="http://us.ard.yahoo.com/SIG=12jb8qu89/M=493064.10729649.11333340.8674578/D \
=groups/S=1705004726:NC/Y=YAHOO/EXP=1191551301/A=4507179/R=0/SIG=12de4rskk/*http://us.rd.yahoo.com/evt=50284/*http://finance.yahoo.com/personal-finance">It's \
Now Personal</a></p> <p>Guides, news,</p>
<p>advice & more.</p> </div>
<div class="ad">
<div id="hd1">Y! Messenger</div>
<p><a href="http://us.ard.yahoo.com/SIG=12j1khesj/M=493064.10729668.11333359.8674578/D \
=groups/S=1705004726:NC/Y=YAHOO/EXP=1191551301/A=3848578/R=0/SIG=11umg3fun/*http://us.rd.yahoo.com/evt=42403/*http://messenger.yahoo.com">Files \
to share?</a></p> <p>Send up to 1GB of</p>
<p>files in an IM.</p> </div>
<div class="ad">
<div id="hd1">Best of Y! Groups</div>
<p><a href="http://us.ard.yahoo.com/SIG=12j1bihoi/M=493064.11127061.11695037.8674578/D \
=groups/S=1705004726:NC/Y=YAHOO/EXP=1191551301/A=4763759/R=0/SIG=11ou7otip/*http://advision.webevents.yahoo.com/bestofyahoogroups/">Check \
it out</a></p> <p>and nominate your</p>
<p>group to be featured.</p> </div>
</div>
</div> <!-- |**|end egp html banner|**| -->
<div style="clear:both; color: #FFF; font-size:1px;">.</div>
</div> <img src="http://geo.yahoo.com/serv?s=97359714/grpId=479767/grpspId=1705004726/msgId=6647/stime=1191544100/nc1=4507179/nc2=3848578/nc3=4763759" \
width="1" height="1"> <br>
<span style="color: white;">__,_._,___</span>
<!--~-|**|PrettyHtmlEnd|**|-~-->
</body>
<!--~-|**|PrettyHtmlStart|**|-~-->
<head>
<style type="text/css">
<!--
#ygrp-mlmsg {font-size:13px; font-family: \
arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} #ygrp-mlmsg table \
{font-size:inherit;font:100%;} #ygrp-mlmsg select, input, textarea {font:99% \
arial,helvetica,clean,sans-serif;} #ygrp-mlmsg pre, code {font:115% \
monospace;*font-size:100%;} #ygrp-mlmsg * {line-height:1.22em;}
#ygrp-text{
font-family: Georgia;
}
#ygrp-text p{
margin: 0 0 1em 0;
}
#ygrp-tpmsgs{
font-family: Arial;
clear: both;
}
#ygrp-vitnav{
padding-top: 10px;
font-family: Verdana;
font-size: 77%;
margin: 0;
}
#ygrp-vitnav a{
padding: 0 1px;
}
#ygrp-actbar{
clear: both;
margin: 25px 0;
white-space:nowrap;
color: #666;
text-align: right;
}
#ygrp-actbar .left{
float: left;
white-space:nowrap;
}
.bld{font-weight:bold;}
#ygrp-grft{
font-family: Verdana;
font-size: 77%;
padding: 15px 0;
}
#ygrp-ft{
font-family: verdana;
font-size: 77%;
border-top: 1px solid #666;
padding: 5px 0;
}
#ygrp-mlmsg #logo{
padding-bottom: 10px;
}
#ygrp-vital{
background-color: #e0ecee;
margin-bottom: 20px;
padding: 2px 0 8px 8px;
}
#ygrp-vital #vithd{
font-size: 77%;
font-family: Verdana;
font-weight: bold;
color: #333;
text-transform: uppercase;
}
#ygrp-vital ul{
padding: 0;
margin: 2px 0;
}
#ygrp-vital ul li{
list-style-type: none;
clear: both;
border: 1px solid #e0ecee;
}
#ygrp-vital ul li .ct{
font-weight: bold;
color: #ff7900;
float: right;
width: 2em;
text-align:right;
padding-right: .5em;
}
#ygrp-vital ul li .cat{
font-weight: bold;
}
#ygrp-vital a {
text-decoration: none;
}
#ygrp-vital a:hover{
text-decoration: underline;
}
#ygrp-sponsor #hd{
color: #999;
font-size: 77%;
}
#ygrp-sponsor #ov{
padding: 6px 13px;
background-color: #e0ecee;
margin-bottom: 20px;
}
#ygrp-sponsor #ov ul{
padding: 0 0 0 8px;
margin: 0;
}
#ygrp-sponsor #ov li{
list-style-type: square;
padding: 6px 0;
font-size: 77%;
}
#ygrp-sponsor #ov li a{
text-decoration: none;
font-size: 130%;
}
#ygrp-sponsor #nc {
background-color: #eee;
margin-bottom: 20px;
padding: 0 8px;
}
#ygrp-sponsor .ad{
padding: 8px 0;
}
#ygrp-sponsor .ad #hd1{
font-family: Arial;
font-weight: bold;
color: #628c2a;
font-size: 100%;
line-height: 122%;
}
#ygrp-sponsor .ad a{
text-decoration: none;
}
#ygrp-sponsor .ad a:hover{
text-decoration: underline;
}
#ygrp-sponsor .ad p{
margin: 0;
}
o {font-size: 0; }
.MsoNormal {
margin: 0 0 0 0;
}
#ygrp-text tt{
font-size: 120%;
}
blockquote{margin: 0 0 0 4px;}
.replbq {margin:4}
-->
</style>
</head>
<!--~-|**|PrettyHtmlEnd|**|-~-->
</html><!--End group email -->
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic