Re: merging old document trees, many "conflicts"

On Tue, 4 Sep 2007, Andy Levy wrote:

> On 9/4/07, Dan Yost <svn@sola5.com> wrote:

[snip]

> > What I want to do is to place "My Documents" (let's just use that as a
> > simple reference point) under Subversion control, for my PC.
>
> Why not (manually) get your 2 instances of My Documents in sync
> *outside* the realm of Subversion first, then import it all into your
> repository? It seems like you're opening yourself up for errors &
> introducing a layer of complexity that you just don't need by trying
> to to do the initial synchronization via Subversion.

Thanks very much--you may indeed be correct.

In fact, I'd already started *some* pruning, going through and deleting
some stuff that was obviously just trash, both to save disk space (here
and on the server) and to simplify.

I'd been thinking that maybe I need to somehow determine what version of
something is "fresher" via a manual approach.

Example: blahfiles/myfile.odt on PC and blahfiles/myfile.odt on laptop,
and I have to simply decide if the later DATE is most current, or use some
other way to see what's the file to start with.

I was half tempted to just blow everything away on the laptop and then
sync, but that'd be very bad as I know I have docs on there that I edited
on the road and haven't brought back in-house.

Anyway, that may be the only real way to proceed. I hate it when I make a
mess and then have to clean it up...

Thanks much,
Dan

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 4 19:25:34 2007