Re: Replacing a file in a working copy - Sorry

[Larry Jones]

=?iso-8859-1?B?QW5kcukgTORocg==?= writes:
> 
> If I replace a file in my updated working copy I am not able to do a
> merge afterwards. Even if i don't replace it but copy and paste the
> whole contents in that working copy it doesn't work. 
> There is no error message. The System just responds with: 
> M filename 
> 
> and nothing happens. I think it's because I already updated to the
> newest Revision. But do I have no possibility to replace the updated
> working copy by any other file and redo a merge?

If you've already updated to the latest revision, how do you expect CVS
to know what merge you want to re-do?  You either have to update to the
old revision, replace it with your new file, and then update to the
latest revision (which will do the merge) or you can use two -j options
on an update to explicitly specify what changes to re-do.

-Larry Jones

Wow, how existential can you get? -- Hobbes