You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Miha Vitorovic <mv...@nil.si> on 2008/05/30 06:30:06 UTC
Svn 1.4 -> 1.5 upgrade [Was: SVN 1.5.x dump and relative externals]
Thank you Karl an Mark for the info. I'm not sure I will test the 1.5 ->
1.4 transition, there just isn't enough time.
But, I do have another question: We didn't have much need for branching
and merging until recently, but now we have a project where it is the
norm. We have created two "branches" of the trunk already (they are more
of a beta and release branch, actually), so the they will remain
"permanent", and the trunk will be continuously merged into them. So, my
question is, will these two "branches" automagically receive merge info
when I upgrade the server, or is there something special I need to do
(maybe delete and recreate them?).
Br,
---
Miha Vitorovic
Inženir v tehničnem področju
Customer Support Engineer
NIL Data Communications, Tivolska cesta 48, 1000 Ljubljana, Slovenia
Phone +386 1 4746 500 Fax +386 1 4746 501 http://www.NIL.si
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Svn 1.4 -> 1.5 upgrade
Posted by Mark Phippard <ma...@gmail.com>.
2008/6/2 Miha Vitorovic <mv...@nil.si>:
> Karl Fogel <kf...@red-bean.com> wrote on 01.06.2008 05:33:27:
>
>> Miha Vitorovic <mv...@nil.si> writes:
>> > Thank you Karl an Mark for the info. I'm not sure I will test the 1.5
> ->
>> > 1.4 transition, there just isn't enough time.
>> >
>> > But, I do have another question: We didn't have much need for
> branching
>> > and merging until recently, but now we have a project where it is the
>> > norm. We have created two "branches" of the trunk already (they are
> more
>> > of a beta and release branch, actually), so the they will remain
>> > "permanent", and the trunk will be continuously merged into them. So,
> my
>> > question is, will these two "branches" automagically receive merge
> info
>> > when I upgrade the server, or is there something special I need to do
>> > (maybe delete and recreate them?).
>>
>> Well, we'd need to know more details before saying for sure, but see
>> http://subversion.tigris.org/svn_1.5_releasenotes.html#mt-compatibility
>> (it may answer your question).
>>
>> Upgrading the server will *not* automatically go back and add the
>> svn:mergeinfo property to any old revisions. This has various
>> implications, most of which don't seem to be documented well enough in
>> the Release Notes :-). We'd like to improve that, and understanding
>> your scenario may help us do so...
>
> Karl,
>
> thanks for your answer, and no,
> http://subversion.tigris.org/svn_1.5_releasenotes.html#mt-compatibility
> does not help me in any way.
>
> Anyhoo, our setup is as follows; we are maintaining a web application (php
> scripts, design), and I have set up three folders tied to three servers.
> Trunk (testing server), staging (pre-release testing server) and release
> (production server). All development is made on the trunk, and may as well
> break the server. Once the feature is ready, the entire trunk is merged
> into the staging. Then we perform some tests to see if it works as
> expected and does not break anything. If it seems OK, the entire staging
> folder is merged into release.
>
> So, I do not need the merge info for the past merges, but I'd be happy if
> I get it from the first merge after the server upgrade on. What I need is
> for a recipe that would give me that. I have a feeling that deleting the
> current staging and release folders and creating them again from the trunk
> will give me that, but I would like to get an answer from someone who
> knows what's going on under the hood.
You do not need to recreate branches. Merge tracking will immediately
know about the ancestry of a branch upon upgrading to 1.5. I think
what Karl was getting at is that merge tracking will not have any
knowledge of merges that were performed to those branches. You can
use the svn merge --record-only option to manually tell it about
merged revisions if you want to.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Svn 1.4 -> 1.5 upgrade
Posted by Miha Vitorovic <mv...@nil.si>.
Karl Fogel <kf...@red-bean.com> wrote on 01.06.2008 05:33:27:
> Miha Vitorovic <mv...@nil.si> writes:
> > Thank you Karl an Mark for the info. I'm not sure I will test the 1.5
->
> > 1.4 transition, there just isn't enough time.
> >
> > But, I do have another question: We didn't have much need for
branching
> > and merging until recently, but now we have a project where it is the
> > norm. We have created two "branches" of the trunk already (they are
more
> > of a beta and release branch, actually), so the they will remain
> > "permanent", and the trunk will be continuously merged into them. So,
my
> > question is, will these two "branches" automagically receive merge
info
> > when I upgrade the server, or is there something special I need to do
> > (maybe delete and recreate them?).
>
> Well, we'd need to know more details before saying for sure, but see
> http://subversion.tigris.org/svn_1.5_releasenotes.html#mt-compatibility
> (it may answer your question).
>
> Upgrading the server will *not* automatically go back and add the
> svn:mergeinfo property to any old revisions. This has various
> implications, most of which don't seem to be documented well enough in
> the Release Notes :-). We'd like to improve that, and understanding
> your scenario may help us do so...
Karl,
thanks for your answer, and no,
http://subversion.tigris.org/svn_1.5_releasenotes.html#mt-compatibility
does not help me in any way.
Anyhoo, our setup is as follows; we are maintaining a web application (php
scripts, design), and I have set up three folders tied to three servers.
Trunk (testing server), staging (pre-release testing server) and release
(production server). All development is made on the trunk, and may as well
break the server. Once the feature is ready, the entire trunk is merged
into the staging. Then we perform some tests to see if it works as
expected and does not break anything. If it seems OK, the entire staging
folder is merged into release.
So, I do not need the merge info for the past merges, but I'd be happy if
I get it from the first merge after the server upgrade on. What I need is
for a recipe that would give me that. I have a feeling that deleting the
current staging and release folders and creating them again from the trunk
will give me that, but I would like to get an answer from someone who
knows what's going on under the hood.
Br,
---
Miha Vitorovic
Inženir v tehničnem področju
Customer Support Engineer
NIL Data Communications, Tivolska cesta 48, 1000 Ljubljana, Slovenia
Phone +386 1 4746 500 Fax +386 1 4746 501 http://www.NIL.si
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Svn 1.4 -> 1.5 upgrade
Posted by Karl Fogel <kf...@red-bean.com>.
Miha Vitorovic <mv...@nil.si> writes:
> Thank you Karl an Mark for the info. I'm not sure I will test the 1.5 ->
> 1.4 transition, there just isn't enough time.
>
> But, I do have another question: We didn't have much need for branching
> and merging until recently, but now we have a project where it is the
> norm. We have created two "branches" of the trunk already (they are more
> of a beta and release branch, actually), so the they will remain
> "permanent", and the trunk will be continuously merged into them. So, my
> question is, will these two "branches" automagically receive merge info
> when I upgrade the server, or is there something special I need to do
> (maybe delete and recreate them?).
Well, we'd need to know more details before saying for sure, but see
http://subversion.tigris.org/svn_1.5_releasenotes.html#mt-compatibility
(it may answer your question).
Upgrading the server will *not* automatically go back and add the
svn:mergeinfo property to any old revisions. This has various
implications, most of which don't seem to be documented well enough in
the Release Notes :-). We'd like to improve that, and understanding
your scenario may help us do so...
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org