[RFC] Moving uncommited changes from a tree to another.
Matthieu Moy
moy at csa.iisc.ernet.in
Wed Aug 9 15:41:24 BST 2006
Kevin Smith <yarcs <at> qualitycode.com> writes:
>
> 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.
Well, it seems we're saying the same thing in a different way:
> Would it be possible to just have a command that converts the current
> uncommitted changes to a bundle,
That's what I call 1).
> and another that applies a bundle to
> the working tree without committing?
That's what I call 3).
My 2) is just
$ bzr bundle --local-changes (or whatever you call it)
$ bzr revert
but in a more efficient way, since you don't have to diff the local tree twice
if all the stuff is in "revert".
Aaron's answer below seems to go in that direction. Cool :-).
--
Matthieu
More information about the bazaar
mailing list