Reverting merges is going to be hard without implementing a full VCS backend.  But then what 
happens to the RDBMS?  This case should be rare.  So I think the right thing to do is make "Make 
a copy" work.