[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Public bzr access?

* Anthony Towns [Thu, 06 Dec 2007 22:57:29 +1000]:

> On Thu, Dec 06, 2007 at 01:47:49PM +0100, Adeodato Sim?? wrote:
> > * Anthony Towns [Wed, 05 Dec 2007 22:42:47 +1000]:
> > > I've restored it and also added the current working branch as:
> > > 	http://ftp-master.debian.org/bzr/ftpmaster-dak
> > > which is more current, and doesn't tend to have all the weird merge
> > > changelogs.
> > That's nice, indeed. Is there a reason, even, to keep the old
> > "debian-archive-kit" branch, that needs to be updated by hand, and just
> > provide this new one with the old name? (The name that eg. d-d-a knows
> > about.)

> I don't really understand bzr enough to say. The history of the d-a-k
> branch and the ftpmaster-dak one aren't the same; I don't know if
> replacing one by the other would cause problems for people who have
> existing checkouts.

Yes, it would cause "trouble", easily resolved by passing --overwrite to
pull just once, by everyody who has a checkout. Or, by doing on ries:

  % cd /org/ftp.debian.org/bzr/ftpmaster-dak
  % bzr merge ../debian-archive-kit
  % bzr commit -m 'Merge from debian-archive-kit.'
  % cd ..
  % mv debian-archive-kit debian-archive-kit.old
  % mv ftpmaster-dak debian-archive-kit

That is, merge backwards, from debian-archive-kit into ftpmaster-dak one
single time.

Is up to you, of course, but IMHO a public copy of the live branch is
*very* valuable, since every committed change will be instantly
available, without the need of an ftpmaster merging back periodically.


Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
— As the ship lay in Boston Harbor, a party the colonists dressed as red
  Indians boarded the vessel, behaved very rudely, and threw all the tea
  overboard, making the tea unsuitable for drinking. Even for Americans. 
                -- George W. Banks in “Mary Poppins”

Reply to: