Public SourceMage Discussion List

["Jeremy Blosser (emrys)" <jblosser-smgl AT firinn.org>]

On Apr 02, Arwed von Merkatz [v.merkatz AT gmx.net] wrote:
> On Sat, Apr 01, 2006 at 12:56:42PM -0600, Jeremy Blosser (emrys) wrote:
> > On Apr 01, George Sherwood [pilot AT beernabeer.com] wrote:
> > > <rant> I certainly am not smart enough to know what scm should
> > > replace p4, but it is unacceptable that every other weekend p4 seems to
> > > go down until Monday.
> > >   Weekends should be a time for our volunteers to work on SMGL and
> > > now we can't do so.
> > >   We often talk and talk about something and never implement.  But this
> > > is something we need to make the "best" choice and then implement.
> > > </rant>
> > 
> > As of last night there is a bzr install on fawkes, and I'm working with 
> > the
> > sorcery and cauldron teams so far to get their stuff set up in it.  This
> > isn't necessarily a real switch yet but it will hopefully get to real work
> > being done in it and we'll see how it goes.
> > 
> > If grimoire wants to play too, let us know.
> 
> We'd certainly like to come play. I've never used bzr before, so I just
> installed it locally and will play around with it a bit here first.

You were asking about it being per-changeset vs. per-file.  According to
Andrew, the merges are per-changeset, but the commits are per-file, and the
changesets are defined by the commits.  He or Karsten can correct me on the
details, but it sounds like you should be able to do:

branch, cd branch, edit foo bar baz, commit foo, push

to just push the changes to foo but not bar and baz.

Attachment: pgpWTBoooyV1B.pgp
Description: PGP signature