Re: RES: Blank log messages when user has no access to specific folder
On Tue, May 17, 2011 at 09:56:56AM +0200, Daniel Shahaf wrote: > The latter. Though from memory it's a one-line change to > libsvn_repos/fs-wrap.c. > > (no time right now or I'd give a better pointer) If such a patch was written we should probably add this as an option specified somewhere in the authz grammar (allow_log or somesuch). Though I like the pre-commit hook script suggestion by Thorsten as well. It's definitely the quickest way to stop the problem from occurring ASAP.
Properties lost on checkin
Hi, I have a workarea where I merged in some changes from a completely different repository. One of the changes was the creation of a link. After checking in I see that the link is ok in my workarea but not in any other workarea. This due to the missing svn:special keyword that was not checked in. How can this happen? The following shows inconsistent behaviour in my opinion. How can this be explained: esquad$ svn proplist -v tm.h Properties on 'tm.h': svn:special * esquad$ svn info tm.h Path: tm.h Name: tm.h URL: https://server/trunk/include/tm/tm.h Repository Root: https://server Repository UUID: 608964b8-1798-474c-b2d9-552667dc04a5 Revision: 27 Node Kind: file Schedule: normal Last Changed Author: christoph Last Changed Rev: 26 Last Changed Date: 2011-05-16 18:11:17 -0400 (Mon, 16 May 2011) Text Last Updated: 2011-05-17 02:51:09 -0400 (Tue, 17 May 2011) Checksum: 1a7ff762ceabb28ca8865f9b0ba377ff esquad$ svn proplist -v https://server/trunk/include/tm/tm.h esquad$ svn diff -r HEAD tm.h This shows that locally the svn:special keyword is set but not on the server. But svn does not see any difference. Is this a known bug? Or how can I get the missing keywords checked in? Christoph
Re: Properties lost on checkin
CC += dev@ I haven't tried with 1.6.x, but merging a symlink-add from a foreign repository does result in bogus state with current trunk: [[[ % $svn merge -c r922451 https://svn.apache.org/repos/asf/subversion/site/publish/ --- Merging (from foreign repository) r922451 into '.': Afaq.en.html % $svn st ~M faq.en.html % $svn info faq.en.html Path: faq.en.html Name: faq.en.html Working Copy Root Path: /tmp/svn/wc1 URL: file:///tmp/svn/r1/trunk/faq.en.html Repository Root: file:///tmp/svn/r1 Repository UUID: 0d8f1070-806c-11e0-a89b-a382cea1935c Node Kind: file Schedule: add % file faq.en.html faq.en.html: ASCII text, with no line terminators % ]]] I'll forward this to dev@ (CC'ing you). Christoph Bartoschek wrote on Tue, May 17, 2011 at 09:24:30 +0200: > Hi, > > I have a workarea where I merged in some changes from a completely > different repository. One of the changes was the creation of a link. > After checking in I see that the link is ok in my workarea but not in > any other workarea. > > This due to the missing svn:special keyword that was not checked in. How > can this happen? > > The following shows inconsistent behaviour in my opinion. How can this > be explained: > > esquad$ svn proplist -v tm.h > Properties on 'tm.h': > svn:special > * > > esquad$ svn info tm.h > Path: tm.h > Name: tm.h > URL: https://server/trunk/include/tm/tm.h > Repository Root: https://server > Repository UUID: 608964b8-1798-474c-b2d9-552667dc04a5 > Revision: 27 > Node Kind: file > Schedule: normal > Last Changed Author: christoph > Last Changed Rev: 26 > Last Changed Date: 2011-05-16 18:11:17 -0400 (Mon, 16 May 2011) > Text Last Updated: 2011-05-17 02:51:09 -0400 (Tue, 17 May 2011) > Checksum: 1a7ff762ceabb28ca8865f9b0ba377ff > > esquad$ svn proplist -v https://server/trunk/include/tm/tm.h > > esquad$ svn diff -r HEAD tm.h > > > This shows that locally the svn:special keyword is set but not on the > server. But svn does not see any difference. Is this a known bug? Or > how can I get the missing keywords checked in? > > > Christoph
Re: Properties lost on checkin
Hi,
I have a small script that reproduces the problem:
dir=$PWD
svnadmin create a
svnadmin create b
svn co file://${dir}/a ca1
svn co file://${dir}/b cb1
cd ${dir}/ca1
touch file
svn add file
svn ci -m "Added file"
ln -sf file link
svn add link
svn ci -m "Added link"
cd ${dir}/cb1
svn merge -r 0:1 file://${dir}/a .
svn ci -m "Merged revision 1"
svn up
svn merge -r 1:2 file://${dir}/a .
svn ci -m "Merged revision 2"
cd ${dir}
svn co file://${dir}/b cb2
ls -l cb1
ls -l cb2
Am 17.05.2011 12:00, schrieb Daniel Shahaf:
CC += dev@
I haven't tried with 1.6.x, but merging a symlink-add from a foreign
repository does result in bogus state with current trunk:
[[[
% $svn merge -c r922451
https://svn.apache.org/repos/asf/subversion/site/publish/
--- Merging (from foreign repository) r922451 into '.':
Afaq.en.html
% $svn st
~M faq.en.html
% $svn info faq.en.html
Path: faq.en.html
Name: faq.en.html
Working Copy Root Path: /tmp/svn/wc1
URL: file:///tmp/svn/r1/trunk/faq.en.html
Repository Root: file:///tmp/svn/r1
Repository UUID: 0d8f1070-806c-11e0-a89b-a382cea1935c
Node Kind: file
Schedule: add
% file faq.en.html
faq.en.html: ASCII text, with no line terminators
%
]]]
I'll forward this to dev@ (CC'ing you).
Christoph Bartoschek wrote on Tue, May 17, 2011 at 09:24:30 +0200:
Hi,
I have a workarea where I merged in some changes from a completely
different repository. One of the changes was the creation of a link.
After checking in I see that the link is ok in my workarea but not in
any other workarea.
This due to the missing svn:special keyword that was not checked in. How
can this happen?
The following shows inconsistent behaviour in my opinion. How can this
be explained:
esquad$ svn proplist -v tm.h
Properties on 'tm.h':
svn:special
*
esquad$ svn info tm.h
Path: tm.h
Name: tm.h
URL: https://server/trunk/include/tm/tm.h
Repository Root: https://server
Repository UUID: 608964b8-1798-474c-b2d9-552667dc04a5
Revision: 27
Node Kind: file
Schedule: normal
Last Changed Author: christoph
Last Changed Rev: 26
Last Changed Date: 2011-05-16 18:11:17 -0400 (Mon, 16 May 2011)
Text Last Updated: 2011-05-17 02:51:09 -0400 (Tue, 17 May 2011)
Checksum: 1a7ff762ceabb28ca8865f9b0ba377ff
esquad$ svn proplist -v https://server/trunk/include/tm/tm.h
esquad$ svn diff -r HEAD tm.h
This shows that locally the svn:special keyword is set but not on the
server. But svn does not see any difference. Is this a known bug? Or
how can I get the missing keywords checked in?
Christoph
Re: Properties lost on checkin
I committed
http://svn.apache.org/viewvc?view=rev&revision=r1104092
before I saw this mail from you.
(please add dev@ to CC if needed)
Christoph Bartoschek wrote on Tue, May 17, 2011 at 11:06:47 +0200:
> Hi,
>
> I have a small script that reproduces the problem:
>
> dir=$PWD
>
> svnadmin create a
> svnadmin create b
>
> svn co file://${dir}/a ca1
> svn co file://${dir}/b cb1
>
> cd ${dir}/ca1
> touch file
> svn add file
> svn ci -m "Added file"
> ln -sf file link
> svn add link
> svn ci -m "Added link"
>
> cd ${dir}/cb1
> svn merge -r 0:1 file://${dir}/a .
> svn ci -m "Merged revision 1"
> svn up
> svn merge -r 1:2 file://${dir}/a .
> svn ci -m "Merged revision 2"
>
> cd ${dir}
> svn co file://${dir}/b cb2
>
> ls -l cb1
> ls -l cb2
>
> Am 17.05.2011 12:00, schrieb Daniel Shahaf:
>> CC += dev@
>>
>> I haven't tried with 1.6.x, but merging a symlink-add from a foreign
>> repository does result in bogus state with current trunk:
>>
>> [[[
>> % $svn merge -c r922451
>> https://svn.apache.org/repos/asf/subversion/site/publish/
>> --- Merging (from foreign repository) r922451 into '.':
>> Afaq.en.html
>> % $svn st
>> ~M faq.en.html
>> % $svn info faq.en.html
>> Path: faq.en.html
>> Name: faq.en.html
>> Working Copy Root Path: /tmp/svn/wc1
>> URL: file:///tmp/svn/r1/trunk/faq.en.html
>> Repository Root: file:///tmp/svn/r1
>> Repository UUID: 0d8f1070-806c-11e0-a89b-a382cea1935c
>> Node Kind: file
>> Schedule: add
>>
>> % file faq.en.html
>> faq.en.html: ASCII text, with no line terminators
>> %
>> ]]]
>>
>>
>> I'll forward this to dev@ (CC'ing you).
>>
>>
>> Christoph Bartoschek wrote on Tue, May 17, 2011 at 09:24:30 +0200:
>>> Hi,
>>>
>>> I have a workarea where I merged in some changes from a completely
>>> different repository. One of the changes was the creation of a link.
>>> After checking in I see that the link is ok in my workarea but not in
>>> any other workarea.
>>>
>>> This due to the missing svn:special keyword that was not checked in. How
>>> can this happen?
>>>
>>> The following shows inconsistent behaviour in my opinion. How can this
>>> be explained:
>>>
>>> esquad$ svn proplist -v tm.h
>>> Properties on 'tm.h':
>>>svn:special
>>> *
>>>
>>> esquad$ svn info tm.h
>>> Path: tm.h
>>> Name: tm.h
>>> URL: https://server/trunk/include/tm/tm.h
>>> Repository Root: https://server
>>> Repository UUID: 608964b8-1798-474c-b2d9-552667dc04a5
>>> Revision: 27
>>> Node Kind: file
>>> Schedule: normal
>>> Last Changed Author: christoph
>>> Last Changed Rev: 26
>>> Last Changed Date: 2011-05-16 18:11:17 -0400 (Mon, 16 May 2011)
>>> Text Last Updated: 2011-05-17 02:51:09 -0400 (Tue, 17 May 2011)
>>> Checksum: 1a7ff762ceabb28ca8865f9b0ba377ff
>>>
>>> esquad$ svn proplist -v https://server/trunk/include/tm/tm.h
>>>
>>> esquad$ svn diff -r HEAD tm.h
>>>
>>>
>>> This shows that locally the svn:special keyword is set but not on the
>>> server. But svn does not see any difference. Is this a known bug? Or
>>> how can I get the missing keywords checked in?
>>>
>>>
>>> Christoph
>
RES: RES: Blank log messages when user has no access to specific folder
Hello Thorsten, What happens here is that we have a module with base classes, and all other classes inherit from one in this module. Sometimes we alter something on one of these classes that cause an impact on the subclasses, forcing us to also commit them. Commiting the modules separately is definitely an easy solution, I just wanted to check if there was some other way to do it. Thank you all for your help. Ricardo -Mensagem original- De: Thorsten Schöning [mailto:tschoen...@am-soft.de] Enviada em: terça-feira, 17 de maio de 2011 03:47 Para: users@ Assunto: Re: RES: Blank log messages when user has no access to specific folder Guten Tag Ricardo Smania (Desenv), am Montag, 16. Mai 2011 um 18:36 schrieben Sie: > The path isn't > important, so if there is a way to show the paths and log message, > but without showing the contents, that would also be a viable solution for us. I don't think so, there is only read write access in general, not divided by log, file contents etc. Is there any reason why it's necessary to commit to both of your example modules in one commit and not two? I have the same problem, different tags for different customers with different access rights, and the easiest way to let each customer get his log message is different commits. Of course it's on to the committer to have that in mind, but using a pre commit hook you even may check that there's no commit for both modules with different access rights. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning AM-SoFT IT-Systeme - Hameln | Potsdam | Leipzig Telefon: Potsdam: 0331-743881-0 E-Mail: tschoen...@am-soft.de Web: http://www.am-soft.de AM-SoFT GmbH IT-Systeme, Konsumhof 1-5, 14482 Potsdam Amtsgericht Potsdam HRB 21278 P, Geschäftsführer: Andreas Muchow
Re: Howto: Mercurial to Subversion migration
On Mon, May 16, 2011 at 2:41 AM, Andreas Tscharner wrote: >> I am commiter in the Apache Wave project which was accepted >> into the Apache incubator. We already migrated our issues >> from the googlecode to the Jira and the next step is >> migration of the source code into the Apache SVN from >> Mercurial. I tried to google for information on mercurial to >> svn migration but couldn't find any simple (or even any >> working) solution. It would be a great help to our migration >> effort if someone from the Subversion team can advice on the >> best way to handle this. > > Mercurial comes bundled with the ConvertExtension. This extension accepts a > Mercurial repo as source and SVN as destination. Having said that, I have > never tried it, but you might give it a shot. Details are here: > http://mercurial.selenic.com/wiki/ConvertExtension I'm reading that page. It seems to support subversion->hg, not the reverse. it can convert "Mercurial" repositories to Mercurial repositories. hg to other formats is not mentioned. > Best regards/Freundliche Grüsse > Wenzel Metromec AG > Andreas Tscharner > -- > Andreas Tscharner, Development > Wenzel Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland > phone: +41 (0)81 257 07 00 > fax: +41 (0)81 257 07 01 > e-mail: mailto:andreas.tschar...@metromec.ch > www: http://www.metromec.ch > > > CT-Dienstleistungen neu bei Wenzel Metromec > = > > Haben Sie einen Prototyp ohne Zeichnung oder Konstruktionsmodell? > Suchen Sie in Ihren Bauteilen Materialschäden, Risse und Poren? > Dann sind unsere neuen Dienstleistungen im Bereich der Computertomographie > die perfekte Lösung für Ihre Anforderungen! > > Testen Sie uns und unsere neue WENZEL exaCT Anlage. > Zögern Sie nicht und nehmen Sie noch heute mit uns Kontakt auf. > mailto:c...@metromec.ch?subject=CT-Dienstleistungen > >
Re: RES: Blank log messages when user has no access to specific folder
Daniel Shahaf wrote on Tue, May 17, 2011 at 09:56:56 +0200: > The latter. Though from memory it's a one-line change to > libsvn_repos/fs-wrap.c. > See svn_repos_fs_revision_prop() > (no time right now or I'd give a better pointer) > > Ricardo Smania (Desenv) wrote on Mon, May 16, 2011 at 13:33:20 -0300: > > Hello Daniel, > > > > Is that patch already available or it would have to be developed from > > scratch? > > > > Thank you, > > > > Ricardo > > > > > > -Mensagem original- > > De: Daniel Shahaf [mailto:d...@daniel.shahaf.name] > > Enviada em: segunda-feira, 16 de maio de 2011 12:38 > > Para: Ricardo Smania (Desenv) > > Cc: users@subversion.apache.org > > Assunto: Re: Blank log messages when user has no access to specific folder > > > > Ricardo Smania (Desenv) wrote on Mon, May 16, 2011 at 11:10:34 -0300: > > > Is there a way to always show the log message, even if the user can't see > > > the complete list of files/folders that were commited? > > > > > > > Not without applying a custom patch to the server. > > > > (to libsvn_repos)
Re: Subversion Installation on AIX
Srivastava, Vishal wrote on Mon, May 16, 2011 at 13:39:22 -0400: > -- completed all in neon > -- making all in serf > /usr/cvs/subversion/subversion-1.6.16/apr/libtool --silent --tag=CC > --mo > de=link gcc -Wl,-brtl -static -o test/serf_get -lm > /usr/cvs/subversion/subv > ersion-1.6.16/apr-util/libaprutil-1.la > /usr/cvs/subversion/subversion-1.6.16 > /apr-util/xml/expat/lib/libexpat.la -liconv > /usr/cvs/subversion/subversion-1.6.1 > 6/apr/libapr-1.la -lpthread -lm -lz -lssl -lcrypto > ld: 0711-317 ERROR: Undefined symbol: .main > ld: 0711-345 Use the -bloadmap or -bnoquiet option to obtain more information. > collect2: ld returned 8 exit status > make: 1254-004 The error code from the last command is 1. This is a problem building the serf library (as distinguished from libsvn_ra_serf), so ask this on the serf users list. BUT: you build neon successfully, and neon and serf are alternatives; so just --without-serf should get you a working Subversion client too.
SVN won't let me check in
I am having trouble checking in to SVN only. I can check out fine. I seem to be denied access to this folder: https:// OurDomain /svn/ OurProjectName /!svn/act/GUID however, the developer next to me can log into our server with his login on my machine and check in just fine. Here is the text from my Subversion command-line client, version 1.6.15 on Windows version 6.1.7600: C:\SVN\trunk\ETL>svn commit . --username DOMAIN\userName --password Pwd123 -m "" svn: Commit failed (details follow): svn: access to '/svn/netPal/!svn/act/e99777d7-beea-704e-bd4d-55d84d2dfbf6' forbidden Shaun Merrill ~ Seattle area
