valable team mailing list archive

["Ali Sabil" <ali.sabil@xxxxxxxxx>]

Hi Andrew,

Actually you didn't overwrite my commit at all, you just "merged", you can
try to run "bzr vis lp:valable", to see visually what has happened (you will
need bzr-gtk installed), so basically, you just did the right thing :) (some
people prefer what is known as rebasing to keep the history linear, but
rebasing destroys the history of the project imho).

The document [1] describes the various workflows supported by bzr, we
generally prefer the workflow 5 and 6, depending on the size of the project.
I suggest we go with the workflow 5 for Valable, but please feel free to
disagree. The documentation for the 5th and 6th workflow can be found here
[2].

[1] http://bazaar-vcs.org/Workflows
[2]
http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#team-collaboration-distributed-style

Cheers,

--
Ali


On Sun, Nov 2, 2008 at 12:03 PM, Johann Prieur <johann.prieur@xxxxxxxxx>wrote:

> ---------- Forwarded message ----------
> From: Andrew Flegg <andrew@xxxxxxxx>
> Date: Sun, Nov 2, 2008 at 11:42 AM
> Subject: [Valable] Oops
> To: valable@xxxxxxxxxxxxxxxxxxx
>
>
> Hi,
>
> I *seem* to have clobbered the commit by Ali at r19. The change is
> still there, but a push & pull seems to have now put my name against
> it.
>
> Sorry. I've still yet to find a decent document explaining the best
> way of working with multiple branchs and bzr. Johann, have you a
> preference?
>
> Thanks in advance,
>
> Andrew
>
> --
> Andrew Flegg -- mailto:andrew@xxxxxxxx  |  http://www.bleb.org/
> maemo.org <http://www.bleb.org/maemo.org> Community Council member
>
> _______________________________________________
> Mailing list: https://launchpad.net/~valable<https://launchpad.net/%7Evalable>
> Post to     : valable@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~valable<https://launchpad.net/%7Evalable>
> More help   : https://help.launchpad.net/ListHelp
>