Kyoushu Posted June 15, 2011 Report Share Posted June 15, 2011 I'm having a problem with /main on one of my repositories. When I switch to the trunk my workspace is emptied of all but two directories. All other directories and files that should be in the root directory are missing. I can see that the latest changeset contains functions.php when I use "Show changeset content", and I can view the file, but it isn't in my workspace and clicking "View" -> "View branch content" brings up a box that never finishes loading. Can anybody shed some light onto what's happened please? Link to comment Share on other sites More sharing options...
Kyoushu Posted June 15, 2011 Author Report Share Posted June 15, 2011 I've just discovered what happened. Somebody else merged a changeset where they deleted files they didn't need, not realising that those delete actions would also be merged. Link to comment Share on other sites More sharing options...
psantosl Posted June 15, 2011 Report Share Posted June 15, 2011 Ok Kyoushu, you were too fast for us!! Please let us know if we can help you somehow. The way in which we handle deletions on merge has been revisited for the upcoming 4.0. Basically the "algebra" right now is: a delete wins, but in 4.0 we let you decide whether you really want to delete it or not, which I think makes much more sense. pablo Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.