recording branch specific TODO's

Robert Collins robertc at robertcollins.net
Tue Jan 3 08:33:54 GMT 2006


On Tue, 2006-01-03 at 01:33 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:
> | What do you guys think of us making a file, 'BRANCH-TODO', which should
> | always be empty when merging to an integration branch ?
> |
> | This would let us track whats needed to merge a branch in the branch,
> | and have a trivial thing to check to see if stuff has changed. I find
> | the current TODO overwhelming for this task.
> 
> Seems okay to me.  I'm inclined to think, though, that it should not be
> one logical file.  We should create it fresh, with a new id, every time
> we need it, and delete it when all TODO's are done.

Why? I think having the file exist, so its obvious in a diff - and has a
header explaining itself (which the one I've added to my integration
branch does) is more useful than a file which only clued up people know
to create, which can cause merge conflicts when two feature branches
decide to join - or split...

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060103/26ca58f8/attachment.pgp 


More information about the bazaar mailing list