subversion merge help

[jeremy8fc <sv...@neverbox.com>]

Hi,
I just started using subversion, to experiment with it, I'm using it to keep
the files synced up between my home & work computers... the problem I am
having is that I copied my directory home to import it into subversion and
then weeded out the files I (maybe) don't need. This way I could delete
without really losing anything if I made the wrong choice. 

It took me a bit longer to get svnserve running ... Now my work folder is
out of sync having the current changes for the past three days. Is there a
way to merge this current work folder with a working copy from the
repository. 

I've gone through by hand and deleted the files I no longer need. This
leaves only the current changes that need to be accounted for. I at first
thought I could just import it as a branch and merge the branch with my
trunk, either I can't do that or I'm doing it wrong....I ended up deleting
the branch and then svn add'ed the files to a new branch instead of using
the import command..same result.

Is this something I can fix with a svn merge? (I hope so, the alternative is
to spend another weekend deleting and moving files around again :) )
--
View this message in context: http://www.nabble.com/subversion-merge-help-t1187137.html#a3127192
Sent from the Subversion Users forum at Nabble.com.


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: subversion merge help

[jeremy8fc <sv...@neverbox.com>]

Florian Pose wrote:
> 
> 
> If I understood you right, your work folder is no working copy yet. Why
> don't you create a new working copy of the newest revision with "svn co"
> on your working place and then copy the changed files of your work
> folder into it? Subversion will automatically detect your changes.
> 
> 
Actually that is what I ended up doing...eveything should be correct now.
Thanks for the response.
--
View this message in context: http://www.nabble.com/subversion-merge-help-t1187137.html#a3195492
Sent from the Subversion Users forum at Nabble.com.


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: subversion merge help

[Florian Pose <fl...@keenkiwi.de>]

jeremy8fc schrieb:
> It took me a bit longer to get svnserve running ... Now my work folder is
> out of sync having the current changes for the past three days. Is there a
> way to merge this current work folder with a working copy from the
> repository.

If I understood you right, your work folder is no working copy yet. Why
don't you create a new working copy of the newest revision with "svn co"
on your working place and then copy the changed files of your work
folder into it? Subversion will automatically detect your changes.

Regards,
Florian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org