On Thu, 2006-03-23 at 10:19 -0700, Bob Proulx wrote:
> Craig White wrote:
> > I actually re-phrased my question because I did almost the exact thing
> > (but --dry-run) and started a new thread. It 'appears' to me that it is
> > going to add everything and doesn't look right to me.
>
> Try a test case. Create your own private, throwaway repository to use
> as a testing sandbox. Try some things in your own private area. Get
> familiar with it without any worry that it won't work. You can try
> several things and get familiar with the operations. Then you can
> throw it away and do what you want to do for real.
>
> It is a little bit of effort to play and to teach yourself how the
> tools work but the effort will pay itself back later in useful
> knowledge and experience with the system.
>
> Here is an example:
>
> mkdir proving-ground
> svnadmin create $repos
> repos=file://$(pwd)/proving-ground/one
> svn mkdir $repos/trunk $repos/branches $repos/tags \
> -m "Creating project infrastructure"
> svn checkout $repos/trunk one
> cd one
> echo foo > foo
> svn add foo
> svn commit -m "* foo: New file."
> REV_ONE=... Put the real revision here
> svn copy \
> $repos/trunk \
> $repos/branches/my-devel-area \
> -m "Creating a working branch to play on."
> svn switch $repos/branches/my-devel-area
> ...play... make a change, commit
> REV_TWO=... Put the real revision here
> svn switch $repos/trunk
> svn merge -r$REV_ONE:$REV_TWO $repos .
> svn commit
> ... throw it away and try again with something different...
>
> Unfortuantely I did no test the above and just typed it in off the top
> of my head. But that is the point of having a scratch area to work
> through these details. After you work the exercise and get some
> experience with the commands you will be more confident working with
> the real sources.
----
thanks Bob - I got it now...had to learn about the command 'svn log
--stop-on-copy'
I didn't connect the two...and it was the issue since everything was
already there from revision 1-13 and it was at revision 14 where I
branched and thus I only needed to merge from 14 on.
Craig
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 23 18:38:48 2006