I started to reread chapter 4 and tried:
svn merge -r 14:HEAD tags/his_work
from my trunk directory. That seemed to work a little better but it
still "Skipped missing target:"(s) since my coworker did add some
files. Does merge not add new files?
If I commit will the .merge-right.r15, .merge-left.r14, and .working
files be cleaned up? They show up with '?'s when I do a svn status,
but chapter 4 doesn't mention them.
~Thanks
On Thu, 14 Oct 2004 09:35:21 -0700, v4r4n <console.cowboy@gmail.com> wrote:
> I've already done what I need to do simply by editing files by hand
> and copying the files into the directory I want, but I'm trying to be
> a big boy, pretend my project is too complex for such a simple
> solution, and use svn to solve all my problems.
>
> Currently, I'm the only real software person at my job and before I
> came everyone was writing programs without using any sort of
> versioning software. As the software person in my workplace, I
> believe it is in my best interests to try and get everyone using svn
> for their projects so that it is easier to go back and see what
> changed when and fix problems efficiently.
>
> The problem is that I myself am not very experienced with versioning
> software. I've known about CVS forever, but no one used it at school
> and we weren't allowed to install it.
>
> So here I am, trying to adopt a repository setup using
> trunk/tags/branches. Since I'm still the only one actually using svn,
> I've been working on the trunk of this project, but a coworker
> recently worked on my latest version of the trunk (copied by hand).
> He made some significant changes and added a few new files. Since I
> wanted to keep a separate snapshot of his work for testing, I put his
> work in as a branch, but then decided his work should be considered a
> tag since he was just working on core functionality of the project.
>
> So after running it through a few tests and making some minor
> modifications I'd like to bring his code into my trunk while
> maintaining the history of changes to the files. People always talk
> about branch merges, but I think I want to do a "tag merge", which is
> a little backwards.
>
> Since I've never done this before I checked out a new working copy to
> try things out. My first attempt with:
>
> svn merge tags/his_work@15 trunk@15 trunk
>
> was disastrous. It didn't copy the new files he added and when I did
> an 'svn diff' a bunch of scary blank lines with no diff information
> were spit out at me.
>
> So I guess I still don't really know what I'm doing. Should I not be
> trying to use svn merge? Should I just be using svn copy and delete?
> What exactly does svn do in the situation where you want to copy a
> newer file on top of the older one? When I do this by hand, svn just
> treats the changes as if I'd just done them all at once right then. I
> really don't want to lose the diff data.
>
> Suggestions?
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Oct 14 22:41:09 2004