[RFC] Moving uncommited changes from a tree to another.

Michael Ellerman michael at ellerman.id.au
Wed Aug 9 05:46:18 BST 2006


On 8/9/06, Kevin Smith <yarcs at qualitycode.com> wrote:
> On Sun, 2006-08-06 at 16:25 +0200, Matthieu Moy wrote:
> > I believe the best way to handle this would be:
> >
> > 1) allow revision bundles to refer to uncommited changes. I believe
> >    Robert's proposal to consider the working tree as a kind of
> >    particular revision goes in this direction too.
> >
> > 2) Have "bzr revert" leave a bundle of the state of the tree before
> >    revert somewhere.
> >
> > 3) Have a way to apply this bundle without creating a new revision. I
> >    mean, the changes should appear in the working tree as they used to
> >    be.
>
> I'm not sure about the technical aspects, but 1+2 seem like an awkward
> kludge from a user perspective.
>
> Would it be possible to just have a command that converts the current
> uncommitted changes to a bundle, and another that applies a bundle to
> the working tree without committing?

I don't think that's possible without surgery on the bundle code,
because it assumes you're talking about revisions.

Aaron's 'shove' command is awesome, it works for me. I guess the only
problem with it vs a bundle approach is you need both trees
write-accessible at the same time. But it's a minor problem IMHO.

Actually I think it should be in the core.

cheers




More information about the bazaar mailing list