<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Oct 23, 2013 at 12:23 PM, Tim Moody <span dir="ltr"><<a href="mailto:tim@timmoody.com" target="_blank">tim@timmoody.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div dir="ltr">
<div dir="ltr">
<div style="font-size:12pt;font-family:Calibri">
<div>which commit was fa2d59?</div>
<div> </div></div></div></div></blockquote><div><br></div><div>"Merge pull request #3 from jvonau/masterjv"<br></div><div><br></div><div>I think he means revert *till* ^^</div><div><br></div><div>The commit after that was:</div>
<div><br></div><div><div>"Copy all files from DXS upto commit "Merge pull request #52 from scollazo/featu..."</div><div><br></div></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div dir="ltr"><div dir="ltr"><div style="font-size:12pt;font-family:Calibri">
<div>This is the same discussion we had yesterday about when we move from dxs to
xsce. What would be the criteria for deciding to merge the dxs branch into
master?</div>
<div></div></div></div></div></blockquote><div><br></div><div>I think that is the thing which is "up in the air" at this point. I think yesterday we had decided to just copy everything from dxs to xsce:master. </div>
<div><br></div><div>If we stick to that decision, Miguel's steps 1->3 will result in us having the dxs branch with the full history, and we should do the step 4 of merging xsce:dxs into xsce:master.</div><div> </div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><div dir="ltr"><div style="font-size:12pt;font-family:Calibri">
<div> </div>
<div>And it still doesn’t address the question of where ongoing differences
between dxs and xsce will live.</div>
<div> </div>
<div>I’m OK with 1-3, but I’m skeptical about working on the dxs branch. I
guess I’m OK with doing a git merge instead of copy to get dxs into xsce as long
as people don’t lose work, but now rather than later.</div>
<div> </div></div></div></div></blockquote><div><br></div><div>Exactly! I also think it is a risk to have "development" being done in xsce:dxs. I would be in favor of just creating a xsce:dxs with all the dxs commits, so we don't lose the history, and then we just merge that to the xsce:master branch and just continue working there.</div>
<div><br></div><div>WhatSay?</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr">
<div dir="ltr"><div style="font-size:12pt;font-family:Calibri">
<div style="font-size:12pt;font-family:Calibri">Tim</div>
<div style="font-style:normal;font-size:small;display:inline;text-decoration:none;font-family:Calibri;font-weight:normal">
<div style="font-style:normal;font-variant:normal;font-weight:normal;font-size:10pt;line-height:normal;font-family:tahoma">
<div> </div>
<div style="background-color:rgb(245,245,245)">
<div><b>From:</b> <a title="anish@activitycentral.com" href="mailto:anish@activitycentral.com" target="_blank">Anish Mangal</a> </div>
<div><b>Sent:</b> Wednesday, October 23, 2013 2:51 PM</div>
<div><b>To:</b> <a title="xsce-devel@googlegroups.com" href="mailto:xsce-devel@googlegroups.com" target="_blank">xsce-devel</a> </div>
<div><b>Cc:</b> <a title="server-devel@lists.laptop.org" href="mailto:server-devel@lists.laptop.org" target="_blank">XS Devel</a> </div>
<div><b>Subject:</b> Re: [XSCE] XSCE/xsce and activitycetral/dxs repository
integration in a branch preserving history</div></div></div>
<div> </div></div><div><div class="h5">
<div style="font-style:normal;font-size:small;display:inline;text-decoration:none;font-family:Calibri;font-weight:normal">
<div dir="ltr">I think this approach makes sense. As I understand it:
<div> </div>
<div>* We want to be good historians and follow the proper workflow, which also
implies that "master" should ideally never be broken.</div>
<div>* While we are switching to ansible, we do the switch *in a branch* called
dxs and *not master*</div>
<div>* All fixes and porting efforts happen on the dxs branch. This implies that
ALL pull requests must be created against xsce:dxs rather than
xsce:master.</div>
<div>* Once the port is done, it is merged into master. All development happens
on master.</div>
<div> </div>
<div>The risk we run is that the dxs branch will become the active branch being
worked upon. Which is non-ideal (All development must ideally happen against
master). So we have a couple of options:</div>
<div> </div>
<div>a. Merge the dxs branch with the current set of dxs commits into master.
Follow all development there.</div>
<div>b. Set a hard deadline for merging dxs into master.</div>
<div> </div>
<div>I think I like option a. better.</div>
<div>Option b. has the advantage of ensuring a working master. </div>
<div> </div>
<div>Thoughts?<br></div>
<div> </div>
<div>Regardless of which path we choose, it's a good idea to keep the dxs
history, and the dxs branch should be created (Steps 1. and 2. from Miguel's
email)</div>
<div> </div>
<div>Anish<br><br></div></div>
<div class="gmail_extra">
<div class="gmail_quote">On Wed, Oct 23, 2013 at 9:28 AM, Miguel González <span dir="ltr"><<a href="mailto:migonzalvar@activitycentral.com" target="_blank">migonzalvar@activitycentral.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="padding-left:1ex;margin:0px 0px 0px 0.8ex;border-left-color:rgb(204,204,204);border-left-width:1px;border-left-style:solid">
<div dir="ltr">
<div>My suggestion to integrate "activitycetral/dxs" into "XSCE/xsce"
preserving history and using a branch for easier comparison is:</div>
<div> </div>
<div>1. revert xsce/master to fa2d59,</div>
<div>2. create a 'dxs' branch<br></div>
<div>3. merge activitycentral/dxs commits to this new branch preserving
history<br></div>
<div> </div>
<div>This new branch (XSCE/xsce@dxs) will be the canonical repository for the
migration and everybody will pull request against this branch.</div>
<div> </div>
<div> </div>
<div>Detailed procedure on a fresh repository</div>
<div>----</div>
<div> </div>
<div>1. revert</div>
<div> </div>
<div>Clean repo:</div>
<div>```</div>
<div>git clone git@github.com:XSCE/xsce.git<br></div>
<div>cd xsce</div>
<div>```</div>
<div> </div>
<div>The actual revert:</div>
<div>```</div>
<div>git revert -m 1 b1638cd --no-edit<br></div>
<div>```</div>
<div> </div>
<div>Submit changes:</div>
<div>```</div>
<div>git push origin</div>
<div>```</div>
<div> </div>
<div>2. create branch</div>
<div> </div>
<div>```</div>
<div>git branch dxs</div>
<div>git checkout dxs</div>
<div>git push origin dxs</div>
<div>```</div>
<div> </div>
<div>3. merge</div>
<div> </div>
<div>Fetch dxs repository:</div>
<div>```</div>
<div>git remote add dxs git@github.com:activitycentral/dxs<br></div>
<div>git fetch dxs</div>
<div>```</div>
<div> </div>
<div>And now the critical part, the actual merge:</div>
<div>```<br></div>
<div>git merge --no-ff -s recursive -X ours --no-edit dxs/master<br></div>
<div>```</div>
<div> </div>
<div>Push!</div>
<div>```</div>
<div>git push origin dxs</div>
<div>````</div>
<div> </div>
<div>So, anyone with write permission on xsce can do this.</div>
<div> </div>
<div>You can check how would be the resulting repo in my personal clone copy
in <a href="https://github.com/migonzalvar/xsce" target="_blank">https://github.com/migonzalvar/xsce</a>.</div><span><font color="#888888">
<div> </div>
<div> </div>
<div> </div>-- <br>
<div dir="ltr">Miguel González<br>Activity Central: <a href="http://www.activitycentral.com" target="_blank">http://www.activitycentral.com</a><br></div></font></span></div></blockquote></div>
<div> </div></div></div></div></div></div></div></div>
</blockquote></div><br></div></div>