Hi Everyone,
I am having some issues understanding tree conflicts.
I attempted the following;
svn merge -r1:head trunk/com/palcare/listsServices/
branches/production/com/palcare/listsServices/ --accept="theirs-full"
and got this;
Skipped 'branches/production/com/palcare/listsServices/ListsServi
I understand what is going on now, but this seems to indicate that I will
need to look up revision numbers from tags every time I do a merge in SVN.
Is there any automated way of doing this? It seems like a huge step
backwards to go from using symbols that mean something to me to using
numbers
On Tue, Apr 19, 2011 at 10:56:28AM -0400, Daniel Walter wrote:
> svn merge appears to work with revision numbers but not symbolically
> with tags. Is this expected?
>
> The merge happens twice if I use tags:
> svn merge tag1 tag2 --non-interactive
>
> But when I find the revisions with svn info
On Apr 19, 2011, at 09:56, Daniel Walter wrote:
> svn merge appears to work with revision numbers but not symbolically with
> tags. Is this expected?
Tags are not symbols. Tags are directories. You can merge with directories if
you want, provided you use their complete repository URL, or a val
svn merge appears to work with revision numbers but not symbolically with
tags. Is this expected?
The merge happens twice if I use tags:
svn merge tag1 tag2 --non-interactive
But when I find the revisions with svn info
svn info tag1
Last Changed Rev: 457
svn info tag2
Last Changed Rev: 467
> On Tue, Apr 19, 2011 at 12:02 AM, Daniel Becroft
> wrote:
> > On Tue, Apr 19, 2011 at 7:29 AM, Alex Vincent
> wrote:
> >>
> >> I'm currently in the process of updating copyright notices where
> I work.
> >> To me, this is an ideal place for a SVN keyword:
> >>
> >> Copyright 2008-$Year$ MyCompa
I'm suddenly getting the same error:
"Transmitting file data ...svnsync: Error while replaying commit".
I'm syncing between a Ubuntu with 1.6.5 and os x 1.6.16.
I never had this error, I don't have any right issue.
I was syncing as usual, while commiting other stuffs
on the main server and sud
