[prev in list] [next in list] [prev in thread] [next in thread]
List: unison-users
Subject: Re: [unison-users] Unison and version control
From: worley () alum ! mit ! edu
Date: 2014-03-03 19:43:53
Message-ID: 201403031943.s23Jhr5p022447 () hobgoblin ! ariadne ! com
[Download RAW message or body]
> From: phillip.lord@newcastle.ac.uk
> The other option is to not use unison at all for these directories, but
> to do everything with git. Essentially you use a garbage branch for
> moving content between one repo and another. Instead of unisoning at the
> end of the day you commit everything to garbage, push it, then pull this
> branch at the other end.
I know a little bit about Git, and I believe that it is possible to
use this structure:
Don't synchronize the repositories using Unison. Have all of them use
the same branch name (usually "master") or set of branch names.
Designate one of them as central, and have all other repos point to it
as a master. Now, whenever you create new commits in a repository,
you can push that new commit to the central repo, causing its "master"
to advance. Then you can pull that change to "master" into any of the
other repos.
Dale
[Attachment #3 (text/html)]
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" \
"http://www.w3.org/TR/html4/strict.dtd"> <html>
<head>
</head>
<body style="background-color: #fff;">
<span style="display:none"> </span>
<!--~-|**|PrettyHtmlStartT|**|-~-->
<div id="ygrp-mlmsg" style="position:relative;">
<div id="ygrp-msg" style="z-index: 1;">
<!--~-|**|PrettyHtmlEndT|**|-~-->
<div id="ygrp-text" >
<p>> From: phillip.lord@newcastle.ac.uk<br>
<br>
> The other option is to not use unison at all for these directories, but<br>
> to do everything with git. Essentially you use a garbage branch for<br>
> moving content between one repo and another. Instead of unisoning at the<br>
> end of the day you commit everything to garbage, push it, then pull this<br>
> branch at the other end.<br>
<br>
I know a little bit about Git, and I believe that it is possible to<br>
use this structure:<br>
<br>
Don't synchronize the repositories using Unison. Have all of them use<br>
the same branch name (usually "master") or set of branch names.<br>
Designate one of them as central, and have all other repos point to it<br>
as a master. Now, whenever you create new commits in a repository,<br>
you can push that new commit to the central repo, causing its "master"<br>
to advance. Then you can pull that change to "master" into any of the<br>
other repos.<br>
<br>
Dale<br>
</p>
</div>
<!--~-|**|PrettyHtmlStart|**|-~-->
<div style="color: #fff; height: 0;">__._,_.___</div>
<div style="clear:both"> </div>
<table cellspacing=4px style="margin-top: 20px; margin-bottom: 10px;">
<tbody>
<tr>
<td style="font-size: 12px; font-family: arial; font-weight: bold; padding: \
7px 5px 5px; color: #FFF; background-color: #F2F2F2; border: 1px solid #EAEAEA " > \
<a style="text-decoration: none; color: #2D50FD" \
href="https://groups.yahoo.com/group/unison-users/post;_ylc=X3oDMTJwN2FtdWpkBF9TAzk3Mz \
U5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEbXNnSWQDMTExMjUEc2VjA2Z0cgRzbGsDcnBseQRzdGltZQMxMzkzODc1ODg3?act=reply&messageNum=11125">Reply \
via web post</a> </td>
<td style="font-size: 12px; font-family: arial; padding: 7px 5px 5px; \
color: #FFF; background-color: #F2F2F2; border: 1px solid #EAEAEA; " \
>
<a href="mailto:worley@ariadne.com?subject=Re%3A%20%5Bunison-users%5D%20Unison%20and%20version%20control" \
style="text-decoration: none; color: #2D50FD;"> Reply to sender </a>
</td>
<td style="font-size: 12px; font-family: arial; padding: 7px 5px 5px; \
color: #FFF; background-color: #F2F2F2; border: 1px solid #EAEAEA; "> <a \
href="mailto:unison-users@yahoogroups.com?subject=Re%3A%20%5Bunison-users%5D%20Unison%20and%20version%20control" \
style="text-decoration: none; color: #2D50FD"> Reply to group </a>
</td>
<td style="font-size: 12px; font-family: arial; padding: 7px 5px 5px; \
color: #FFF; background-color: #F2F2F2; border: 1px solid #EAEAEA; " > <a \
href="https://groups.yahoo.com/group/unison-users/post;_ylc=X3oDMTJkcTNlNjdlBF9TAzk3Mz \
U5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDbnRwYwRzdGltZQMxMzkzODc1ODg3" \
style="text-decoration: none; color: #2D50FD">Start a New Topic</a> </td>
<td style="font-size: 12px; font-family: arial; padding: 7px 5px 5px; \
color: #2D50FD; background-color: #F2F2F2; border: 1px solid #EAEAEA; " > <a \
href="https://groups.yahoo.com/group/unison-users/message/11120;_ylc=X3oDMTM1cTBzZzM1B \
F9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEbXNnSWQDMTExMjUEc2VjA2Z0cgRzbGsDdnRwYwRzdGltZQMxMzkzODc1ODg3BHRwY0lkAzExMTIw" \
style="text-decoration: none; color: #2D50FD;">Messages in this topic</a> (5)
</td>
</tr>
</tbody>
</table>
<!------- Start Nav Bar ------>
<!-- |**|begin egp html banner|**| -->
<!-- |**|end egp html banner|**| -->
<!-- |**|begin egp html banner|**| -->
<div id="ygrp-vital" style="background-color: #f2f2f2; font-family: Verdana; \
font-size: 10px; margin-bottom: 10px; padding: 10px;">
<span id="vithd" style="font-weight: bold; color: #333; text-transform: \
uppercase; "><a href="https://groups.yahoo.com/group/unison-users;_ylc=X3oDMTJkOWQ5ZG9 \
iBF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA3Z0bARzbGsDdmdocARzdGltZQMxMzkzODc1ODg3" \
style="text-decoration: none;">Visit Your Group</a></span>
<ul style="list-style-type: none; margin: 0; padding: 0; display: inline;">
<li style="border-right: 1px solid #000; font-weight: 700; display: \
inline; padding: 0 5px; margin-left: 0;"> <span class="cat"><a \
href="https://groups.yahoo.com/group/unison-users/members;_ylc=X3oDMTJlYW1nM3ZuBF9TAzk \
3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA3Z0bARzbGsDdm1icnMEc3RpbWUDMTM5Mzg3NTg4Nw--?o=6" \
style="text-decoration: none;">New Members</a></span> <span class="ct" style="color: \
#ff7900;">6</span> </li>
</ul>
</div>
<div id="ft" style="font-family: Arial; font-size: 11px; margin-top: 5px; padding: 0 \
2px 0 0; clear: both;"> <a \
href="https://groups.yahoo.com/;_ylc=X3oDMTJjNzI4ZGVxBF9TAzk3MzU5NzE0BGdycElkAzQ3OTc2NwRncnBzcElkAzE3MDUwMDQ3MjYEc2VjA2Z0cgRzbGsDZ2ZwBHN0aW1lAzEzOTM4NzU4ODc-" \
style="float: left;"><img \
src="http://l.yimg.com/ru/static/images/yg/img/email/new_logo/logo-groups-137x15.png" \
height="15" width="137" alt="Yahoo! Groups" style="border: 0;"/></a> <div \
style="color: #747575; float: right;"> • <a \
href="https://info.yahoo.com/privacy/us/yahoo/groups/details.html" \
style="text-decoration: none;">Privacy</a> • <a \
href="mailto:unison-users-unsubscribe@yahoogroups.com?subject=Unsubscribe" \
style="text-decoration: none;">Unsubscribe</a> • <a \
href="https://info.yahoo.com/legal/us/yahoo/utos/terms/" style="text-decoration: \
none;">Terms of Use</a> </div> </div>
<!-- |**|end egp html banner|**| -->
</div> <!-- ygrp-msg -->
<!-- Sponsor -->
<!-- |**|begin egp html banner|**| -->
<div id="ygrp-sponsor" style="width:160px; float:right; clear:none; margin:0 0 25px \
0; background: #fff;">
<!-- Start Recommendations -->
<div id="ygrp-reco">
</div>
<!-- End Recommendations -->
</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=11125/stime=1393875887" \
width="1" height="1"> <br>
<div style="color: #fff; height: 0;">__,_._,___</div>
<!--~-|**|PrettyHtmlEnd|**|-~-->
</body>
<!--~-|**|PrettyHtmlStart|**|-~-->
<head>
<style type="text/css">
<!--
#ygrp-mkp {
border: 1px solid #d8d8d8;
font-family: Arial;
margin: 10px 0;
padding: 0 10px;
}
#ygrp-mkp hr {
border: 1px solid #d8d8d8;
}
#ygrp-mkp #hd {
color: #628c2a;
font-size: 85%;
font-weight: 700;
line-height: 122%;
margin: 10px 0;
}
#ygrp-mkp #ads {
margin-bottom: 10px;
}
#ygrp-mkp .ad {
padding: 0 0;
}
#ygrp-mkp .ad p {
margin: 0;
}
#ygrp-mkp .ad a {
color: #0000ff;
text-decoration: none;
}
#ygrp-sponsor #ygrp-lc {
font-family: Arial;
}
#ygrp-sponsor #ygrp-lc #hd {
margin: 10px 0px;
font-weight: 700;
font-size: 78%;
line-height: 122%;
}
#ygrp-sponsor #ygrp-lc .ad {
margin-bottom: 10px;
padding: 0 0;
}
#actions {
font-family: Verdana;
font-size: 11px;
padding: 10px 0;
}
#activity {
background-color: #e0ecee;
float: left;
font-family: Verdana;
font-size: 10px;
padding: 10px;
}
#activity span {
font-weight: 700;
}
#activity span:first-child {
text-transform: uppercase;
}
#activity span a {
color: #5085b6;
text-decoration: none;
}
#activity span span {
color: #ff7900;
}
#activity span .underline {
text-decoration: underline;
}
.attach {
clear: both;
display: table;
font-family: Arial;
font-size: 12px;
padding: 10px 0;
width: 400px;
}
.attach div a {
text-decoration: none;
}
.attach img {
border: none;
padding-right: 5px;
}
.attach label {
display: block;
margin-bottom: 5px;
}
.attach label a {
text-decoration: none;
}
blockquote {
margin: 0 0 0 4px;
}
.bold {
font-family: Arial;
font-size: 13px;
font-weight: 700;
}
.bold a {
text-decoration: none;
}
dd.last p a {
font-family: Verdana;
font-weight: 700;
}
dd.last p span {
margin-right: 10px;
font-family: Verdana;
font-weight: 700;
}
dd.last p span.yshortcuts {
margin-right: 0;
}
div.attach-table div div a {
text-decoration: none;
}
div.attach-table {
width: 400px;
}
div.file-title a, div.file-title a:active, div.file-title a:hover, div.file-title \
a:visited { text-decoration: none;
}
div.photo-title a, div.photo-title a:active, div.photo-title a:hover, \
div.photo-title a:visited { text-decoration: none;
}
div#ygrp-mlmsg #ygrp-msg p a span.yshortcuts {
font-family: Verdana;
font-size: 10px;
font-weight: normal;
}
.green {
color: #628c2a;
}
.MsoNormal {
margin: 0 0 0 0;
}
o {
font-size: 0;
}
#photos div {
float: left;
width: 72px;
}
#photos div div {
border: 1px solid #666666;
height: 62px;
overflow: hidden;
width: 62px;
}
#photos div label {
color: #666666;
font-size: 10px;
overflow: hidden;
text-align: center;
white-space: nowrap;
width: 64px;
}
#reco-category {
font-size: 77%;
}
#reco-desc {
font-size: 77%;
}
.replbq {
margin: 4px;
}
#ygrp-actbar div a:first-child {
/* border-right: 0px solid #000;*/
margin-right: 2px;
padding-right: 5px;
}
#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-mlmsg #logo {
padding-bottom: 10px;
}
#ygrp-msg p a {
font-family: Verdana;
}
#ygrp-msg p#attach-count span {
color: #1E66AE;
font-weight: 700;
}
#ygrp-reco #reco-head {
color: #ff7900;
font-weight: 700;
}
#ygrp-reco {
margin-bottom: 20px;
padding: 0px;
}
#ygrp-sponsor #ov li a {
font-size: 130%;
text-decoration: none;
}
#ygrp-sponsor #ov li {
font-size: 77%;
list-style-type: square;
padding: 6px 0;
}
#ygrp-sponsor #ov ul {
margin: 0;
padding: 0 0 0 8px;
}
#ygrp-text {
font-family: Georgia;
}
#ygrp-text p {
margin: 0 0 1em 0;
}
#ygrp-text tt {
font-size: 120%;
}
#ygrp-vital ul li:last-child {
border-right: none !important;
}
-->
</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