Created branches, tags, and trunk after the fact, MOSTLY works

[Kevin Ross <ke...@familyross.net>]

Hello,

When the project repository was setup, we didn't include branches, tags, 
and trunk (oversight on our part).  It wasn't until we decided we wanted 
to start branching that we realized this mistake.  So in TortoiseSVN 
repo-browser, I created branches, tags, and trunk folders, and from the 
repo-browser, moved the existing folders into the trunk folder.

I also then created a branch from a specific revision, and it created 
the branch for me.  I've committed changes to the branch (and to the 
trunk) without problems.

However, if I try to "svn switch" between trunk and a branch, I get "no 
common ancestry" error (which I can override with --ignore-ancestry), 
which leads me to believe that I didn't recreate the folder hierarchy 
correctly.

Can anyone help?

Thanks!
-- Kevin

RE: Created branches, tags, and trunk after the fact, MOSTLY works

[Bob Archer <Bo...@amsi.com>]

Ah, that's what I get for responding before reading the whole thread. Glad you figured it out.

> -----Original Message-----
> From: Kevin Ross [mailto:kevin@familyross.net]
> Sent: Monday, February 24, 2014 5:48 PM
> To: Bob Archer; users@subversion.apache.org
> Subject: Re: Created branches, tags, and trunk after the fact, MOSTLY works
> 
> Yes, that was the problem.  I figured it out a little while ago and posted my
> findings.
> 
> Thanks for your help!
> -- Kevin
> 
> On 2/24/2014 2:46 PM, Bob Archer wrote:
> > Are you branching from a point prior to moving your project into the trunk
> directory?
> >
> >> -----Original Message-----
> >> From: Kevin Ross [mailto:kevin@familyross.net]
> >> Sent: Monday, February 24, 2014 4:47 PM
> >> To: users@subversion.apache.org
> >> Subject: Created branches, tags, and trunk after the fact, MOSTLY
> >> works
> >>
> >> Hello,
> >>
> >> When the project repository was setup, we didn't include branches,
> >> tags, and trunk (oversight on our part).  It wasn't until we decided
> >> we wanted to start branching that we realized this mistake.  So in
> >> TortoiseSVN repo- browser, I created branches, tags, and trunk
> >> folders, and from the repo- browser, moved the existing folders into the
> trunk folder.
> >>
> >> I also then created a branch from a specific revision, and it created
> >> the branch for me.  I've committed changes to the branch (and to the
> >> trunk) without problems.
> >>
> >> However, if I try to "svn switch" between trunk and a branch, I get
> >> "no common ancestry" error (which I can override with
> >> --ignore-ancestry), which leads me to believe that I didn't recreate the
> folder hierarchy correctly.
> >>
> >> Can anyone help?
> >>
> >> Thanks!
> >> -- Kevin

Re: Created branches, tags, and trunk after the fact, MOSTLY works

[Kevin Ross <ke...@familyross.net>]

Yes, that was the problem.  I figured it out a little while ago and 
posted my findings.

Thanks for your help!
-- Kevin

On 2/24/2014 2:46 PM, Bob Archer wrote:
> Are you branching from a point prior to moving your project into the trunk directory?
>
>> -----Original Message-----
>> From: Kevin Ross [mailto:kevin@familyross.net]
>> Sent: Monday, February 24, 2014 4:47 PM
>> To: users@subversion.apache.org
>> Subject: Created branches, tags, and trunk after the fact, MOSTLY works
>>
>> Hello,
>>
>> When the project repository was setup, we didn't include branches, tags,
>> and trunk (oversight on our part).  It wasn't until we decided we wanted to
>> start branching that we realized this mistake.  So in TortoiseSVN repo-
>> browser, I created branches, tags, and trunk folders, and from the repo-
>> browser, moved the existing folders into the trunk folder.
>>
>> I also then created a branch from a specific revision, and it created the branch
>> for me.  I've committed changes to the branch (and to the
>> trunk) without problems.
>>
>> However, if I try to "svn switch" between trunk and a branch, I get "no
>> common ancestry" error (which I can override with --ignore-ancestry), which
>> leads me to believe that I didn't recreate the folder hierarchy correctly.
>>
>> Can anyone help?
>>
>> Thanks!
>> -- Kevin

RE: Created branches, tags, and trunk after the fact, MOSTLY works

[Bob Archer <Bo...@amsi.com>]

Are you branching from a point prior to moving your project into the trunk directory?

> -----Original Message-----
> From: Kevin Ross [mailto:kevin@familyross.net]
> Sent: Monday, February 24, 2014 4:47 PM
> To: users@subversion.apache.org
> Subject: Created branches, tags, and trunk after the fact, MOSTLY works
> 
> Hello,
> 
> When the project repository was setup, we didn't include branches, tags,
> and trunk (oversight on our part).  It wasn't until we decided we wanted to
> start branching that we realized this mistake.  So in TortoiseSVN repo-
> browser, I created branches, tags, and trunk folders, and from the repo-
> browser, moved the existing folders into the trunk folder.
> 
> I also then created a branch from a specific revision, and it created the branch
> for me.  I've committed changes to the branch (and to the
> trunk) without problems.
> 
> However, if I try to "svn switch" between trunk and a branch, I get "no
> common ancestry" error (which I can override with --ignore-ancestry), which
> leads me to believe that I didn't recreate the folder hierarchy correctly.
> 
> Can anyone help?
> 
> Thanks!
> -- Kevin

Re: Created branches, tags, and trunk after the fact, MOSTLY works

[Kevin Ross <ke...@familyross.net>]

I think I figured out the problem. When I created the first branch, it 
was from a revision prior to the folder restructuring, which now makes 
sense regarding the "no common ancestor" error.  I just created a new 
branch from a revision after the restructure, and I can switch back and 
forth between it and trunk without problem.

So I think I'm good to go.  I'll just have to use "--ignore-ancestry" 
for that one, first branch.

Thanks!
-- Kevin

On 2/24/2014 1:47 PM, Kevin Ross wrote:
> Hello,
>
> When the project repository was setup, we didn't include branches, 
> tags, and trunk (oversight on our part).  It wasn't until we decided 
> we wanted to start branching that we realized this mistake.  So in 
> TortoiseSVN repo-browser, I created branches, tags, and trunk folders, 
> and from the repo-browser, moved the existing folders into the trunk 
> folder.
>
> I also then created a branch from a specific revision, and it created 
> the branch for me.  I've committed changes to the branch (and to the 
> trunk) without problems.
>
> However, if I try to "svn switch" between trunk and a branch, I get 
> "no common ancestry" error (which I can override with 
> --ignore-ancestry), which leads me to believe that I didn't recreate 
> the folder hierarchy correctly.
>
> Can anyone help?
>
> Thanks!
> -- Kevin
>