[prev in list] [next in list] [prev in thread] [next in thread]
List: unison-users
Subject: Re: [unison-users] Re: merging without an archive
From: Benjamin Pierce <bcpierce () cis ! upenn ! edu>
Date: 2007-03-26 22:51:38
Message-ID: 2F11EE01-8331-49FC-A42B-7B778A7481DC () cis ! upenn ! edu
[Download RAW message or body]
> many thanks for these. for whatever it's worth, here is a line for
> the unison profile which uses emacsW32 for the merging on windows.
> The quoting of special characters is quite different from the unix
> example in the manual, and also this is without requiring archive
> file, which emacs does not need:
>
> merge = Name * -> C:\Progra~1\Emacs\emacs\bin\emacs.exe -q --eval
> "(ediff-files """CURRENT1""" """CURRENT2""")"
Thanks -- I've added this to the manual.
> and a question: is there a way to tell the gui interface to only do
> the synching for a selected line in the list of files it shows?
> (without necessarily ignoring or skipping the rest explicitly)
Nope.
- B
[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>> many thanks for these. for whatever it's worth, here is a line \
for<br> > the unison profile which uses emacsW32 for the merging on windows.<br>
> The quoting of special characters is quite different from the unix<br>
> example in the manual, and also this is without requiring archive<br>
> file, which emacs does not need:<br>
><br>
> merge = Name * -> C:\Progra~1\<wbr>Emacs\emacs\<wbr>bin\emacs.<wbr>exe -q \
--eval<br> > "(ediff-files """CURRENT1"<wbr>"" \
"""CURRENT2"<wbr>"")"<br> <br>
Thanks -- I've added this to the manual.<br>
<br>
> and a question: is there a way to tell the gui interface to only do<br>
> the synching for a selected line in the list of files it shows?<br>
> (without necessarily ignoring or skipping the rest explicitly)<br>
<br>
Nope.<br>
<br>
- B<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/6152;_ylc=X3oDMT \
MzNHFqc3VrBF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEbXNnSWQDNjIxMwRzZWMDZnRyBHNsawN2dHBjBHN0aW1lAzExNzQ5NTU5NTgEdHBjSWQDNjE1Mg--">
Messages in this topic </a> (<span class="bld">0</span>)
</span>
<a href="http://groups.yahoo.com/group/unison-users/post;_ylc=X3oDMTJvNXNyNHIx \
BF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEbXNnSWQDNjIxMwRzZWMDZnRyBHNsawNycGx5BHN0aW1lAzExNzQ5NTU5NTg-?act=reply&messageNum=6213">
<span class="bld">
Reply </span> (via web post)
</a> |
<a href="http://groups.yahoo.com/group/unison-users/post;_ylc=X3oDMTJkcGVyYnQ1 \
BF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDbnRwYwRzdGltZQMxMTc0OTU1OTU4" \
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 \
MTJkMmtiOG5oBF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDbXNncwRzdGltZQMxMTc0OTU1OTU4">Messages</a> \
| <a href="http://groups.yahoo.com/group/unison-users/database;_ylc=X3o \
DMTJiNHRzYmxmBF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDZGIEc3RpbWUDMTE3NDk1NTk1OA--">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=X3oDMTJjczdycXYxBF9TAzk3MzU5NzE0BGdycElkA \
zQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDZ2ZwBHN0aW1lAzExNzQ5NTU5NTg-">
<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=X3oDMTJlaXRrb29hBF9TAzk3MzU \
5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDc3RuZ3MEc3RpbWUDMTE3NDk1NTk1OA--">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=X3oDMTJjZ3FxY2Q5BF9TAzk \
3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDaHBmBHN0aW1lAzExNzQ5NTU5NTg-">
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>13</div> <div class="cat"><a \
href="http://groups.yahoo.com/group/unison-users/members;_ylc=X3oDMTJldW1maWdwBF9TAzk3 \
MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA3Z0bARzbGsDdm1icnMEc3RpbWUDMTE3NDk1NTk1OA--">New \
Members</a></div> </li>
</ul>
<a href="http://groups.yahoo.com/group/unison-users;_ylc=X3oDMTJkZzN1bmJjB \
F9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA3Z0bARzbGsDdmdocARzdGltZQMxMTc0OTU1OTU4">
Visit Your Group </a>
</div>
<div id="hd">SPONSORED LINKS</div>
<div id="ov">
<ul>
<li><a \
href="http://groups.yahoo.com/gads;_ylc=X3oDMTJiN2tqYnJhBF9TAzk3MzU5NzE0BF9wAzEEZ3JwSW \
QDNDc5NzY3BGdycHNwSWQDMTcwNTAwNDcyNgRzZWMDc2xtb2QEc3RpbWUDMTE3NDk1NTk1OA--?t=ms&k=Comp \
uter+telephony&w1=Computer+telephony&w2=Portable+computer&w3=Portable+computer+case&w4 \
=Communication+and+networking&w5=Computer+telephony+integration&c=5&s=145&g=2&.sig=bd1ju6uqJx39MEsoiawksg">Computer \
telephony</a></li> <li><a \
href="http://groups.yahoo.com/gads;_ylc=X3oDMTJiMDZvZHM0BF9TAzk3MzU5NzE0BF9wAzIEZ3JwSW \
QDNDc5NzY3BGdycHNwSWQDMTcwNTAwNDcyNgRzZWMDc2xtb2QEc3RpbWUDMTE3NDk1NTk1OA--?t=ms&k=Port \
able+computer&w1=Computer+telephony&w2=Portable+computer&w3=Portable+computer+case&w4= \
Communication+and+networking&w5=Computer+telephony+integration&c=5&s=145&g=2&.sig=klZKMuOolG_eNWty_hYh4w">Portable \
computer</a></li> <li><a \
href="http://groups.yahoo.com/gads;_ylc=X3oDMTJia3JlajlpBF9TAzk3MzU5NzE0BF9wAzMEZ3JwSW \
QDNDc5NzY3BGdycHNwSWQDMTcwNTAwNDcyNgRzZWMDc2xtb2QEc3RpbWUDMTE3NDk1NTk1OA--?t=ms&k=Port \
able+computer+case&w1=Computer+telephony&w2=Portable+computer&w3=Portable+computer+cas \
e&w4=Communication+and+networking&w5=Computer+telephony+integration&c=5&s=145&g=2&.sig=AsamkASYZNbe7ftQYzzWGQ">Portable \
computer case</a></li> <li><a \
href="http://groups.yahoo.com/gads;_ylc=X3oDMTJidXFxMjFoBF9TAzk3MzU5NzE0BF9wAzQEZ3JwSW \
QDNDc5NzY3BGdycHNwSWQDMTcwNTAwNDcyNgRzZWMDc2xtb2QEc3RpbWUDMTE3NDk1NTk1OA--?t=ms&k=Comm \
unication+and+networking&w1=Computer+telephony&w2=Portable+computer&w3=Portable+comput \
er+case&w4=Communication+and+networking&w5=Computer+telephony+integration&c=5&s=145&g=2&.sig=yoxe9tLE4V_B-4X1sEro_A">Communication \
and networking</a></li> <li><a \
href="http://groups.yahoo.com/gads;_ylc=X3oDMTJidGpmc2ozBF9TAzk3MzU5NzE0BF9wAzUEZ3JwSW \
QDNDc5NzY3BGdycHNwSWQDMTcwNTAwNDcyNgRzZWMDc2xtb2QEc3RpbWUDMTE3NDk1NTk1OA--?t=ms&k=Comp \
uter+telephony+integration&w1=Computer+telephony&w2=Portable+computer&w3=Portable+comp \
uter+case&w4=Communication+and+networking&w5=Computer+telephony+integration&c=5&s=145&g=2&.sig=MRKosOdSpqJyJnCQzkaUqg">Computer \
telephony integration</a></li> </ul>
</div>
<!-- Network content -->
<div id="nc">
<div class="ad">
<div id="hd1">Y! Messenger</div>
<p><a href="http://us.ard.yahoo.com/SIG=12inaoff0/M=493064.9803215.10510209.8674578/D= \
groups/S=1705004726:NC/Y=YAHOO/EXP=1174963158/A=3848580/R=0/SIG=11umg3fun/*http://us.rd.yahoo.com/evt=42403/*http://messenger.yahoo.com">Quick \
file sharing</a></p> <p>Send up to 1GB of</p>
<p>files in an IM.</p> </div>
<div class="ad">
<div id="hd1">Search Ads</div>
<p><a href="http://us.ard.yahoo.com/SIG=12i7snv48/M=493064.9803227.10510220.8674578/D= \
groups/S=1705004726:NC/Y=YAHOO/EXP=1174963158/A=3848641/R=0/SIG=1312g85fq/*http://sear \
chmarketing.yahoo.com/arp/srchv2.php?o=US2003&cmp=Yahoo&ctv=Groups2&s=Y&s2=&s3=&b=50">Get \
new customers.</a></p> <p>List your web site</p>
<p>in Yahoo! Search.</p> </div>
<div class="ad">
<div id="hd1">Yahoo! Groups</div>
<p><a href="http://groups.yahoo.com/start;_ylc=X3oDMTJucWU4djVjBF9TAzk3MzU5NzE0BF9wA \
zMEZ3JwSWQDNDc5NzY3BGdycHNwSWQDMTcwNTAwNDcyNgRzZWMDbmNtb2QEc2xrA2dyb3VwczIEc3RpbWUDMTE3NDk1NTk1Nw--">Start \
a group</a></p> <p>in 3 easy steps.</p>
<p>Connect with others.</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=6213/stime=1174955958/nc1=3848580/nc2=3848641/nc3=3" \
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