Re: [Arx-users] Real-world ArX usage

[Walter Landry]

Amine Chadly <address@hidden> wrote:
> On Fri, 2005-04-29 at 08:41 -0400, Kevin Smith wrote:
> 
> > Each developer would have their own local working archive, which would
> > be a branch off of the master. We would frequently (~hourly?) do a diff
> > between the master and our working archive. For each new patch, we would
> > review the incoming code, and then pull it into our local branch.
> 
> Question: What is the best scenario here : that every developer archive
> be a mirror of the central ArX archive, or that each forks his own
> branch ?

Until I implement hash names for revisions, every developer has to
have their own branch.  Otherwise, you could easily wind up with two
revisions with the same name.

<snip>
> > Then, I think we would use the patch queue manager to merge each
> > developer's changes into a staging mirror of the master archive. I
> > haven't looked at the PQM yet, but we would want a way to trigger it
> > without using email.

If you all have access to a shared filesystem, you can drop requests
in a special directory.

> > In a perfect world, it would monitor each
> > developer's mirrored archive, and automatically initiate the merge.

Are you sure you want to do that?

> > I'm not sure whether we would prefer to pull these patches
> > individually, or as a combined group.

Unfortunately, you pretty much have to pull them as a group.  Making a
"merge" command that applies patches one-at-a-time with appropriate
summaries is on the todo list.

> Ok, let's see if I find how to get this done:
> First I would create the repository and archive on the the main ArX
> server.

You would actually email the patch queue manager (pqm) to have it
create the master archive.  The pqm is designed so that almost any
operation you need can be done through email.

<snip>

> If there is existing source code, you go to the root directory, and then
>  $ arx init repository--application_main/application
> Creates the branch application in the main ArX server.

Alternately, you could branch off of the (mostly empty) master
archive, add all of files, and ask the pqm to merge.

> Each developer to create his copy types:
>  $ arx make-archive --mirror repository--application_main/application
> file://localpath2project
> 
> Ok now, I am stalled and have to wait for your answers :-).

Create a private branch

  arx get repository--application_main/application app
  cd app
  arx fork my-repo/application
  (hack, hack, hack)
  arx commit -s "Useful hacks"
  (send an email to the pqm asking for a merge)

Let me know if that makes sense.

Cheers,
Walter