[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] Re: Undo a commit

From: Daniel Carrera
Subject: Re: [Monotone-devel] Re: Undo a commit
Date: Fri, 10 Oct 2008 18:44:17 +0200
User-agent: Thunderbird (Macintosh/20080914)

Ludovic Brenta wrote:
The command "db kill_rev_locally" is long so I don't like it. What
would be the consequences of a divergence? Is it ok if I simply run
"mtn rebase" and then go on merrily on my way making my other
branches? If so, then I would be entirely happy with rebase.

After "mtn rebase p:", there are two ways you could create a

$ mtn commit

creates a second head in the same branch; later on, "mtn checkout",
"mtn update" and other commands will complain that there are two heads
and require you to select a head manually.  You can resolve that
either with "mtn merge", "mtn suspend" or "mtn disapprove"; it's up to
you.  This is sometimes called "light-weight" branching; it is
appropriate for short-lived divergences that you intend to resolve at
one point in the future.

Ok. "mtn suspend" and "mtn disapprove" look like good solutions. Combined with "mtn rebase" that would cover my use case.

The second way is:

$ mtn commit -b new_branch

I don't like this solution as much. I don't want to change branch name every time I goof off a commit. I'm happy with suspect or disapprove.

So... who do we need to convince to get "mtn rebase"? Do you think that one could be done with a Lua hook? I know I can write a Perl script to do it, but a Lua hook feels like the right way to do it.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]