On Tue, 5 Oct 2004 17:03:18 -0700, Raye Raskin <rayer@pobox.com> wrote:
> >> In the 1.1 SVN book online:
> >>
> >>
> >> http://svnbook.red-bean.com/svnbook-1.1/svn-book.html#svn-ch-4-sect
> >> -3.1
> >>
> >> down about half way through the subsection where the svn merge is done:
> >>
> >> svn merge -r 343:344 http://svn.example.com/repos/calc/trunk
> >>
> >> Can someone please explain why the URL argument at the end of this
> >> command
> >> is needed? Can't SVN deduce it from the context of your working
> >> directory,
> >> i.e., from the contents of your local .svn directory?
> >
> > No, because you are merging from the trunk to your "private branch"
> > (read the whole section in the book to get the context). You need to
> > tell subversion where to merge from. It doesn't make sense to merge
> > from the same branch that your working copy is - that's an "update" not
> > a "merge".
>
> Aha. So if I had 1 ./trunk, 10 ./branches, and 5 ./tags directories
> all containing a copy of integer.c, then there are actually 16 copies
> of integer.c ALL AT THE SAME "344" GLOBAL REVISION NUMBER (since the
> repository works as a whole w.r.t. global revision numbers) but the
> FILE VERSION NUMBER could be different for each copy of integer.c,
> depending on the circumstances. Is that right?
There's not really a concept of a "file version number", except as an
implementation detail, or perhaps a mixed-revision wc.
--
bd
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 6 02:35:04 2004