[Monotone-devel] Re: [Monotone-users] Deleted files

[Stephen Leake]

"Aaron W. Hsu" <address@hidden> writes:

> A have a little question: I have two branches, A and B. I propagate
> from A -> B periodically. There is a file X that I keep up-to-date by
> this  propagation. However, I deleted X from B and then re-added it,

I gather you decided the deletion was a mistake.

You can disapprove the revision that did the deletion, but that might be
a lot of work, depending on how many conflicts that causes.

> which gets  recorded as a separate file now, so propagating from A ->
> B no longer  updates X. What can I do about this?

You can delete X from and B, then add to A, then propagate. Both
branches will then have the new X.

-- 
-- Stephe