You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Mitch Claborn <mi...@claborn.net> on 2008/02/20 18:47:48 UTC
not under version control
svn, version 1.4.2 (r22196)
compiled Nov 10 2006, 17:39:50
Here's the command that is bothering me:
svn merge
file:///home/subversion/repos/survey/branches/T04405c/web/admin/CookieList.jsp@HEAD
file:///home/subversion/repos/survey/trunk/web/admin/CookieList.jsp@HEAD
./web/admin/CookieList.jsp
the result is:
svn: Use --force to override this restriction
svn: 'web/admin/CookieList.jsp' is not under version control
branches/T04405c is a branch from the trunk.
CookieList.jsp is a new file in the trunk that I want to merge into the
branch.
the working directory for the above command is the working directory for
the branch.
Why won't it merge? I've tried the --force option but it doesn't
appear to make any difference.
The same format of command works for updates, but fails on new files.
I must be missing something obvious.
--
Mitch Claborn
mitch@claborn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: not under version control
Posted by Mitch Claborn <mi...@claborn.net>.
Yes - the copy works, but when I later merge a change on the copied file
from the trunk to the branch, it uses a status code of "G" which is not
the same as other files that were merged in the normal way. When I
merge the directory that contains the new file instead of just the new
file, it works as I expect it to, and subsequent merges to the file are
normal.
Is there a way to merge in a new file without merging the whole
directory it lives in?
Mitch Claborn
mitch@claborn.net
Marc Haisenko wrote:
> On Wednesday 20 February 2008, Mitch Claborn wrote:
>
>> svn, version 1.4.2 (r22196)
>> compiled Nov 10 2006, 17:39:50
>>
>> Here's the command that is bothering me:
>> svn merge
>>
>>
> file:///home/subversion/repos/survey/branches/T04405c/web/admin/CookieList.jsp@HEAD
>
>> file:///home/subversion/repos/survey/trunk/web/admin/CookieList.jsp@HEAD
>> ./web/admin/CookieList.jsp
>>
>> the result is:
>> svn: Use --force to override this restriction
>> svn: 'web/admin/CookieList.jsp' is not under version control
>>
>> branches/T04405c is a branch from the trunk.
>> CookieList.jsp is a new file in the trunk that I want to merge into the
>> branch.
>> the working directory for the above command is the working directory for
>> the branch.
>>
>> Why won't it merge? I've tried the --force option but it doesn't
>> appear to make any difference.
>>
>> The same format of command works for updates, but fails on new files.
>>
>> I must be missing something obvious.
>>
>
> Yes: you don't want to merge but copy :-) You can only merge existing files,
> AFAIK. So you'd just do:
>
> cd working_copy/web/admin
> svn cp file:///home/subversion/repos/survey/trunk/web/admin/CookieList.jsp .
>
> HTH,
> Marc
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: not under version control
Posted by Marc Haisenko <ha...@comdasys.com>.
On Wednesday 20 February 2008, Mitch Claborn wrote:
> svn, version 1.4.2 (r22196)
> compiled Nov 10 2006, 17:39:50
>
> Here's the command that is bothering me:
> svn merge
>
file:///home/subversion/repos/survey/branches/T04405c/web/admin/CookieList.jsp@HEAD
> file:///home/subversion/repos/survey/trunk/web/admin/CookieList.jsp@HEAD
> ./web/admin/CookieList.jsp
>
> the result is:
> svn: Use --force to override this restriction
> svn: 'web/admin/CookieList.jsp' is not under version control
>
> branches/T04405c is a branch from the trunk.
> CookieList.jsp is a new file in the trunk that I want to merge into the
> branch.
> the working directory for the above command is the working directory for
> the branch.
>
> Why won't it merge? I've tried the --force option but it doesn't
> appear to make any difference.
>
> The same format of command works for updates, but fails on new files.
>
> I must be missing something obvious.
Yes: you don't want to merge but copy :-) You can only merge existing files,
AFAIK. So you'd just do:
cd working_copy/web/admin
svn cp file:///home/subversion/repos/survey/trunk/web/admin/CookieList.jsp .
HTH,
Marc
--
Marc Haisenko
Comdasys AG
Rüdesheimer Str. 7
80686 München
Germany
Tel.: +49 (0)89 548 433 321
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org