[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Changeset One

From: Paul Burba <ptburba_at_gmail.com>
Date: Tue, 8 Jul 2008 08:43:48 -0700

On Tue, Jul 8, 2008 at 8:28 AM, Mark Phippard <markphip_at_gmail.com> wrote:
> On Tue, Jul 8, 2008 at 11:06 AM, Mark Phippard <markphip_at_gmail.com> wrote:
>> On Tue, Jul 8, 2008 at 3:48 AM, ExtraPic <extrapic_at_extrapic.com> wrote:
>>> I can reproduce with the following script. Its a simple script, needs to
>>> run in your home directory and will trash the following 3 locations in
>>> your home directory:
>>>
>>> jjj2 jjj jjj-central
>>>
>>> It ends with an error message.
>>>
>>> The script is attached. Note that I am not an experienced subversion
>>> user.
>>>
>>> Thanks for your offer to try it.
>>
>> I have not tried this yet, but one thing about that seems somewhat not
>> valid is that your branches have no relationship to each other. Your
>> branches should be created by copying something, otherwise there is no
>> ancestral relationship between the paths.
>>
>> I am not saying your merge should not have still worked, just that as
>> an example this is odd and not how one would use Subversion.
>
> When I run your script I do not get any merge output and that is to be
> expected. You are trying to merge r1 but the branch was created in r1
> so merge tracking will not merge any changes from that revision.
>
> If you change your script so that the files are added and committed
> after the first import, and then merge -c 2 or even just leave off the
> -c argument altogether, it works fine.

Hi Mark (Winder),

I agree with everything Mark P. has said thus far. I cannot reproduce
the error you are seeing with either 1.5.0 or the latest trunk
(r32029) build. What Subversion build are you using?

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-08 17:44:12 CEST

This is an archived mail posted to the Subversion Users mailing list.