On Mon, Apr 20, 2009 at 11:46 AM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> Paul Burba wrote:
>
>>>> What do you expect to happen here? The script attempts to reintegrate
>>>> the *root* of the repository into one of the repository's branches. I
>>>> can add a check for this so a more descriptive error is produced,
>>>> i.e.:
>>>>
>>>> C:\Development\SVN\SVNTests>svn merge
>>>> file:///C:/Development/SVN/SVNTests/repo/branches/b1.0/ wc
>>>> --reintegrate
>>>> svn: Neither the reintegrate source nor target can be the root of the repository
>>>>
>>>> C:\Development\SVN\SVNTests>svn merge
>>>> file:///C:/Development/SVN/SVNTests/repo/ wc\trunk --reintegrate
>>>> svn: Neither the reintegrate source nor target can be the root of the repository
>>>>
>>>> Or am I missing something?
>>> I don't mind an error. But what I do mind is hitting an assertion which
>>> then terminates the process. That's not good.
>>
>> Agreed, added the new error in r37385.
>>
>> I just wanted to be sure that your script was accurately modeling the
>> original report
>> http://groups.google.com/group/tortoisesvn/browse_thread/thread/beb8fe491b46004(tigris.org?pli=1.
>> All that said was '10. Merge branch with trunk.' which to me meas
>> something *other* than merging from/to the repos root.
>
> Hmm - I didn't create the script from that report but simply converted
> Lievens script.
Stefan,
Lieven's script differs from yours in the final merge. He was
reintegrating from the branch's URL to a trunk WC, yours was
reintegrating from the root URL to a trunk WC (which would explain why
his worked):
lgo: $SVN merge --reintegrate file:///tmp/repo/branches/b1.0 wc/trunk/
steveking: SVN merge --reintegrate
file:///d:/Development/SVN/SVNTests/repo wc/trunk/
Is this confusion simply the result of a typo in your script? :-)
> What happens if you merge to trunk instead of root?
We are all merging *to* trunk, it's where we are merging from that is
the problem here. Using your script, if I attempt to merge from the
*branch* URL to the trunk WC the reintegrate merge works as expected:
C:\Development\SVN\SVNTests>svn st wc -v
3 3 pburba wc
3 1 pburba wc\trunk
3 1 pburba wc\trunk\project
3 1 pburba wc\trunk\project\program
3 1 pburba wc\trunk\project\program\prg1.c
3 3 pburba wc\branches
3 3 pburba wc\branches\b1.0
3 3 pburba wc\branches\b1.0\project
3 3 pburba wc\branches\b1.0\project\program
4 4 pburba wc\branches\b1.0\project\program\prg1.c
3 2 pburba wc\tags
3 2 pburba wc\tags\1.0
3 2 pburba wc\tags\1.0\project
3 2 pburba wc\tags\1.0\project\program
3 2 pburba wc\tags\1.0\project\program\prg1.c
C:\Development\SVN\SVNTests>svn info wc\trunk
Path: wc\trunk
URL: file:///C:/Development/SVN/SVNTests/repo/trunk
Repository Root: file:///C:/Development/SVN/SVNTests/repo
Repository UUID: 09b69eea-46be-cc47-a1c0-ad8fc41b7200
Revision: 3
Node Kind: directory
Schedule: normal
Last Changed Author: pburba
Last Changed Rev: 1
Last Changed Date: 2009-04-20 11:51:11 -0400 (Mon, 20 Apr 2009)
C:\Development\SVN\SVNTests>svn merge --reintegrate
file:///C:/Development/SVN/SVNTests/repo/branches/b1.0 wc/trunk/
--- Merging differences between repository URLs into 'wc\trunk':
U wc\trunk\project\program\prg1.c
C:\Development\SVN\SVNTests>svn diff wc
Property changes on: wc\trunk
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/b1.0:r2-4
Index: wc/trunk/project/program/prg1.c
===================================================================
--- wc/trunk/project/program/prg1.c (revision 3)
+++ wc/trunk/project/program/prg1.c (working copy)
@@ -1 +1 @@
-ECHO is on.
+"new line"
Are you seeing something different?
~~~~~
r37385 makes it an error to attempt a reintegrate merge from and/or to
the root of the repository. None of these make any sense for
reintegrate agreed?
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1826719
Received on 2009-04-20 18:02:25 CEST