oship-dev team mailing list archive
-
oship-dev team
-
Mailing list archive
-
Message #00868
Re: [Branch ~oship-dev/oship/main] Rev 368: Commented out line 42 in extract.py -- Eduardo to fix.
On Mon, 2010-01-04 at 21:45 +0100, Roger Erens wrote:
> There is something still flawed with our workflow:
> yesterday I received mail from launchpad that revno 366 was committed
> and/or made public.
...
> Either I should not have received those messages (keeping the branch
> private or the like?) or I should receive them with other branch
> names/nicks/descriptions.
> Or is this a launchpad/bzr bug?
>
> I find this very confusing.
I agree it is confusing.
We currently are using a variation of Centralized:
http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/bazaar_workflows.html#centralized
Except that we maintain a 'stable' branch that only a few people can
commit into.
Originally we tried the Human Gatekeeper approach but this didn't work
very well because people didn't respond to Merge Requests. Maybe the
project was too young?
http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/bazaar_workflows.html#decentralized-with-human-gatekeeper
I do not think that our Workflow is the problem.
If you actually browse the repository you'll see:
==============================================
Eduardo César
2010-01-04 10:18:35
This revision was merged to the branch mainline in revision 366.
Revision ID: edu@starforge-20100104101835-j4lebhbxry7pa7ek
update of extraction module
=======================================================
So you can see that there is a unique Revision ID:
However these aren't sent in the emails. The ones in the emails are the
Rev IDs from the local user's commit.
One thing came to mind was that using bzr merge was incorrect to update
my local copy. I should use bzr update. However, when I use bzr update
I always get "Tree is up to date at revision <local revision #>
If I use bzr update lp:oship I get:
bzr: ERROR: No WorkingTree exists for "bzr
+ssh://bazaar.launchpad.net/~oship-dev/oship/main/".
It doesn't matter which directory I am in either.
But then of course the mini-tutorial
http://doc.bazaar.canonical.com/latest/en/mini-tutorial/index.html#updating-your-branch-from-the-main-branch
says to use bzr merge
I've searched the site and the docs and haven't seen anything about
this. Nor does there seem to be anyway to configure how those emails are
sent.
I suggest that you post a question (Answer) in the
Launchpad Bazaar Integration section and see if we can get an answer to
this. https://answers.launchpad.net/launchpad-code
Cheers,
Tim
--
***************************************************************
Timothy Cook, MSc
LinkedIn Profile:http://www.linkedin.com/in/timothywaynecook
Skype ID == (upon request)
Academic.Edu Profile: http://uff.academia.edu/TimothyCook
You may get my Public GPG key from popular keyservers or
from this link http://timothywayne.cook.googlepages.com/home
Attachment:
signature.asc
Description: This is a digitally signed message part
Follow ups
References