<HTML><HEAD></HEAD>
<BODY dir=ltr>
<DIV dir=ltr>
<DIV style="FONT-SIZE: 12pt; FONT-FAMILY: 'Calibri'; COLOR: #000000">
<DIV>which commit was fa2d59?</DIV>
<DIV> </DIV>
<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>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 style="FONT-SIZE: 12pt; FONT-FAMILY: 'Calibri'; COLOR: #000000">Tim</DIV>
<DIV
style="FONT-SIZE: small; FONT-FAMILY: 'Calibri'; FONT-WEIGHT: normal; COLOR: #000000; FONT-STYLE: normal; TEXT-DECORATION: none; DISPLAY: inline">
<DIV style="FONT: 10pt tahoma">
<DIV> </DIV>
<DIV style="BACKGROUND: #f5f5f5">
<DIV style="font-color: black"><B>From:</B> <A title=anish@activitycentral.com
href="mailto:anish@activitycentral.com">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">xsce-devel</A> </DIV>
<DIV><B>Cc:</B> <A title=server-devel@lists.laptop.org
href="mailto:server-devel@lists.laptop.org">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
style="FONT-SIZE: small; FONT-FAMILY: 'Calibri'; FONT-WEIGHT: normal; COLOR: #000000; FONT-STYLE: normal; TEXT-DECORATION: none; DISPLAY: inline">
<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: #ccc 1px 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
class=HOEnZb><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></BODY></HTML>