<html>
<head>
<style>
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 10pt;
font-family:Verdana
}
</style>
</head>
<body class='hmmessage'>
<BR>
<BR>
kindly stop sending for me emails<BR>
thank you<BR> <BR>> Date: Mon, 13 Apr 2009 08:05:59 -0500<BR>> From: nmb@wartburg.edu<BR>> To: dj_deipotent@yahoo.co.uk<BR>> Subject: Re: Noob questions for installing/upgrading Bazaar, and setting up/understanding feature branch workflow...<BR>> CC: bazaar@lists.canonical.com<BR>> <BR>> On 2009-04-13 2:04 AM, Richard B. wrote:<BR>> >> bzr commit -m "merged new feature"<BR>> ><BR>> > I meant to write<BR>> ><BR>> > bzr commit -m "new feature attempt 1"<BR>> > bzr commit -m "new feature attempt 2"<BR>> > bzr commit -m "new feature attempt 3"<BR>> ><BR>> > then once the feature was complete, I would do the final commit to<BR>> > trunk ?<BR>> <BR>> The final commit doesn't take place on the trunk. When the feature is <BR>> complete, you "merge" the branch to the trunk with<BR>> <BR>> cd Projects/Project1/trunk<BR>> bzr merge ../branch/new_feature<BR>> <BR>> and resolve conflicts and then commit in the trunk directory.<BR>> <BR>> -Neil<BR>> <BR><br /><hr />Express yourself instantly with MSN Messenger! <a href='http://clk.atdmt.com/AVE/go/onm00200471ave/direct/01/' target='_new'>MSN Messenger</a></body>
</html>