On Monday 15 December 2003 05:02, Tristan Seligmann wrote:
> John Szakmeister wrote:
> > So, I guess there are a couple of answers here to prevent losing your
> > local modifications. You can go ahead and try to commit your changes (if
> > they're ready to be committed). As long as someone hasn't done anything
> > to cause a conflict, this should work without a problem. Or, you can run
> > 'svn diff > /
>
> Some of the changed files have had new revisions committed, so
> unfortunately these can't be committed.
That alright, because I discovered that this would still be a problem too.
Later on other operations would be hunting for revisions of the file that
didn't exist at that path. My apologies for giving bad advice on this.
> > path/to/somewhere/safe/local-mods.patch' to save off your current
> > changes, remove the working copy, checkout a new one, and apply the patch
> > with the 'patch' tool. You working copy will now have your local mods
> > inserted back in.
>
> This is what I'm trying to avoid.
>
> Isn't there some way to turn my working copy rooted at /trunk/qmaster/
> into a working copy rooted at / (revision 2122, where /trunk/qmaster
> still existed)? I would think that would solve the problem.
The problem is that the WC is rooted in a rev in which /trunk/qmaster existed.
In this case, the source path and rev passed to svn_repos_dir_delta() existed
and is fine. However, the target path doesn't exist? Why? Because it has
been moved. We're managing to see both sides of the problem. In the first
case (not relocating), the target path doesn't exist. In the latter case
(relocated), the source path doesn't exist.
Unfortunately, I don't see a way. It looks to me like only one path is used
to perform the update against, and that same path is given to
svn_repos_dir_delta() as both a source and target. It would be nice if
update searched forward in history to find the new location of the directory,
and then updated. However, I'm not sure what consequences that would bring,
and I would most certainly say that this would be a post 1.0 feature, if
fixed at all.
Let this sit on the list a little longer, and perhaps one of the developers
with more experience on this can comment on how to do this without removing
the WC. Sorry I couldn't be more helpful.
-John
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 15 11:43:19 2003