[MERGE REQUEST] merge work

[Martin Pool]

On 15 Aug 2005, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> Hi Martin,
> 
> Please merge up to and including revision 999 from
> http://panoramicfeedback.com/opensource/bzr.24

Merged.  I merged it in using your r999 and it worked very well.

> With these changes, the spider-goat appearance is much reduced.

I love it.

> The UI no longer supports merging working trees.  Let's see whether
> anyone actually wants that, before we look at reintroducing it.  One
> approach would be to introduce 'uncommitted' as a '-r' keyword, another
> would be allowing --tree instead of --revision.

Or maybe `merge --uncommitted`, but I agree that it's probably unlikely
to be wanted.

I think the next thing to do is better tracking of merged-in revisions.
The steps would seem to be:

 - when merging, make sure the destination branch includes the revision 
   and inventory objects for everything merged in (and everything
   indirectly merged)

 - add the tip of the merged branch to pending-merges

What do you think?

Ideally then

 - bzr status should show a brief representation of the pending merges

 - bzr log should show them indented

 - bzr merge can use them to find a good basis

-- 
Martin