Workflow problem resulting in useless commit messages

[Colin D Bennett]

On Thu, 11 Dec 2008 11:29:56 +1100
"Andrew King" <eurokang at gmail.com> wrote:

...
> Lets say I make some progress on the feature, then I commit.
> 
> I then try and keep up to date with trunk, because I want to have as
> few conflicts as possible in the long term. So, I have to use bzr
> merge, resolve conflicts, then commit. Commit message is usually
> "Merged from trunk". Repeat this a number of times. I don't use pull,
> because then I have not committed my work, and if I get some
> complicated conflicts that I dont' resolve correctly the first time,
> I am in danger of losing my work.
...
> should we be using bzr send or something instead of push?
> 
> should we be using rebase or something?
> 
> Cheers,
> Andrew

You could use rebase, I think.  I have the same concerns with this.  I
like to stay up to date with the parent branches for stuff I'm working
on, so I end up merging down frequently, as well as committing my work
frequently to avoid losing changes of my own.

However, you might not want to actually throw away the history of those
merge revisions.  It may be useful to know about the details of the
specific merges that took place.

Perhaps the ideal thing would be having a concept within bzr of 'minor
revisions' or something that don't show up at the same level in the log
as your primary changes; maybe just a log formatter option to more
briefly summarize the merged revisions that you consider to be minor.

Regards,
Colin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20081210/cd59b623/attachment.pgp