On Fri, Aug 28, 2009 at 2:37 PM, Ville M. Vainio <[email protected]> wrote:
> > On Fri, Aug 28, 2009 at 10:15 PM, Edward K. Ream<[email protected]> > wrote: > > > Right. But it isn't in the diff either. There is no warning that it is > > gone. > > Yes, because it doesn't know that it's gone - because you can edit the > file before checkin. Files can be edited because of manual conflict > resolution or other manual tweaks, which is probably what happened. Well, I think something is wrong, but let's move on. It's annoying that I can't merge a branch that has already been merged, but I suppose I can do nothing about that. My plan now is to copy files from the one-node branch to a copy of the trunk, examine the diffs, tweak as necessary, run tests and commit. Edward --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en -~----------~----~----~----~------~----~------~--~---
