|
Re: svn external warning for Sakai: msg#00435cms.sakai.devel
Glen, When I've done an svn update someplace where externals have changed, it usually keeps my folder and sticks a .OLD at the end. Any chance this happened for you? I was in pretty much the same boat, though only had minor changes, but was still glad to see that it didn't clobber everything! Chris On 4/19/06 4:18 PM, "Glenn R. Golden" <ggolden@xxxxxxxxx> wrote: > I just did something seemingly innocent that ended up loosing a lot > of work. I'm not quite sure what happened, but perhaps it will > become more clear when I explain it. I think that this is something > we need to watch out for. > > I checked out the sakai/trunk. This had an older version of the site > module. > > Since I was working on the site module, I deleted the site files > locally and checked out svn/site/trunk site. Now I have the latest > in-progress site files in-place with the sakai 2.2. code. > > After *much* work, and *many* changes made to site files, I was > getting ready to check in - but I wanted to make sure all was well > against the latest code - so I ran this command from my dev folder: > > svn update > > Usually, this is a great thing to do, as it updates all the code you > have, leaving your changes alone. But in this case, when it got to > the site files, it wiped out most of my work. This is because it was > updating the site module from the externals definition, which was a > different state of the repo. than I had actually checked out in the > site folder. > > I'm not quite sure what it did, but it seemed to revert most of the > files to the previous version, and deleted much of my new work. It > happened so fast... > > I think the same thing could happen if you have a branch of your > project that you are working on, and you, like I did, place it among > the Sakai 2.2 files. This again sets up a condition where update > from the root will use the externals definition, but your files are > from some other part (another branch) of the repo. > > If I had done an update from site, it would have been fine. I think > the problem was that I did it from the root. > > This is not a problem if you are working on the trunk of your > project - then update and status work great from the root. > > So, if you have a module that is not part of the svn:externals of the > distribution, but have the files in the distribution, and if the > distribution might think that your files belong to it... watch out. > > - Glenn > > Glenn R. Golden > Software Architect, University Of Michigan > ggolden@xxxxxxxxx > > > > ---------------------- > This automatic notification message was sent by Sakai Collab > (http://collab.sakaiproject.org/portal) from the DG: Development site. > You can modify how you receive notifications at My Workspace > Preferences. > [see attachment: "smime.p7s", size: 1854 bytes] Attachments: smime.p7s http://collab.sakaiproject.org/access/content/attachment/4ec2d35a-6bcc-41a4-00b7-2ac4e8fb0ee4/smime.p7s ---------------------- This automatic notification message was sent by Sakai Collab (http://collab.sakaiproject.org/portal) from the DG: Development site. You can modify how you receive notifications at My Workspace > Preferences. |
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| Previous by Date: | Re: JSF bundle issue: 00435, Maurer, Christopher Wayne |
|---|---|
| Next by Date: | Re: svn external warning for Sakai: 00435, Duffy Gillman |
| Previous by Thread: | svn external warning for Sakaii: 00435, Glenn R. Golden |
| Next by Thread: | Re: svn external warning for Sakai: 00435, Glenn R. Golden |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
| News | FAQ | advertise |