Re: [Axiom-developer] GIT

[Gabriel Dos Reis]

"Page, Bill" <address@hidden> writes:

| On Friday, October 27, 2006 3:06 PM Waldek Hebisch wrote:
| > ...
| > Bill Page wrote: 
| > > If you are able to identify and annonate the chunks of this
| > > changeset that represent deletions, additions and those that
| > > need further discussion, I think that would be great. Except
| > > for the issue of the annoying '.arch-ids' files, I still think
| > > the best approach to synchronize /silver and /trunk would be
| > > for Tim to apply the necessary patchs to his tla archive
| > > 'axiom--silver--1'. I think we need to get the workflow running
| > > properly and automatically from axiom--silver--1 into /silver
| > > and manually from /silver back to Tim as I suggested in a
| > > previous email.
| > >
| >
| > I think that as a one-time syncing operation we should apply
| > Tim's changes to /trunk (and Tim should look at the (very small) 
| > difference). Once Tim's changes are in /trunk your robot can
| > automatically update /trunk.
| >
| 
| I have one technical reason for preferring to do the merge
| the other way, from /trunk into /silver. That is because we
| currently have axiom--silver--1 in sync with /silver and a
| robot in place (using Tailor) so that any changes made to
| axiom--silver--1 will be automatically reflected in /silver
| and the two will remain in sync.

I would like to see changes Tim makes to axiom--silver--1 sent to this
list or to the axiom-commits list.  That helps keeping track of the
changes. 

-- Gaby