[Monotone-devel] Killing heads, again

2006-01-12 Thread Bruce Stephens
Suppose someone (with suitable access) decided to start rearranging monotone.texi, and committed a revision on n.v.m that removed monotone.texi (the idea being that Makefile would create it from smaller files, I guess). Anyway, it's resolved that that's not a good idea, so how do you recover?

Re: [Monotone-devel] Killing heads, again

2006-01-12 Thread Bruce Stephens
Justin Patrin <[EMAIL PROTECTED]> writes: [...] > Forgive me if I'm being ignorant somehow (I'm not a heavy monotone > user) but isn't this what "disapprove" is for? No. disapprove commits a reversal of a revision. So if I have a graph: digraph G { base -> a; a -> b; b

Re: [Monotone-devel] Killing heads, again

2006-01-12 Thread Justin Patrin
On 1/12/06, Bruce Stephens <[EMAIL PROTECTED]> wrote: > Suppose someone (with suitable access) decided to start rearranging > monotone.texi, and committed a revision on n.v.m that removed > monotone.texi (the idea being that Makefile would create it from > smaller files, I guess). > > Anyway, it's

Re: [Monotone-devel] Killing heads, again

2006-01-12 Thread Nathaniel Smith
On Thu, Jan 12, 2006 at 01:58:16PM +, Bruce Stephens wrote: > I guess you could merge, but edit out the changes from this fork, but > that's annoying and (if I understand the lifetime issues correctly) > can't remove the deletion of monotone.texi as one would hope (once a > file is dead in any