More documentation

[Jelmer Vernooij]

  affects bzr-rebase
  status triaged
  importance wishlist

> James Westby пишет:
> > On Tue, 2008-03-18 at 13:01 +0200, Alexander Belchenko wrote:
> >> I have some branch where I commit wrong thing. After that I have 5 another commits.
> >> And only then I realize that committed file is completely wrong therefore
> >> should not be used in real work.
> >>
> >> I'd like to cleanup history of my branch (rewrite it) to remove that wrong commit.
> >> What is the best way to do this? rebase? loom?
> >
> > rebase is the strategy to use I think.
> >
> > Unfortunately I can't give you exact instructions of how to do it with
> > the bzr-rebase tool, sorry.
>
> OK, I found solution: rebase --onto.
>
> I had wrong revno 79, and good revisions after it with revnos 80-82.
> So I did this:
>
> bzr rebase -r80..82 --onto 78 .
>
> And this command effectively removes old wrong revno 79 from my history.
> Nice :-).
>
> Jelmer, may be it's worth to put such recipe into rebase user manual or FAQ?
Makes sense; bzr rebase needs more documentation in general I guess.

Cheers,

Jelmer

--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

[pdf23ds (pdf23ds)]

In particular, it would be nice if you had *something* on the "replay" command.

"Each revision that is replayed may cause conflicts in the tree. If this
happens the command will stop and allow you to fix them up. Resolve the
commits as you would for a merge, and then run 'bzr resolve' to marked
them as resolved. Once you have resolved all the conflicts you should
run 'bzr rebase-continue' to continue the rebase operation."

How does this apply to replay commands?