Yep, I updated the externals to point to the branch.
I'm cleaning that up now.
TTFN,
-bd-
On Sep 29, 2005, at 7:44 AM, Sean Schofield wrote:
From the Subversion online documentation ...
"Merging changes sounds simple enough, but in practice it can become a
headache. The problem is that if you repeatedly merge changes from one
branch to another, you might accidentally merge the same change twice.
When this happens, sometimes things will work fine. When patching a
file, Subversion typically notices if the file already has the change,
and does nothing. But if the already-existing change has been modified
in any way, you'll get a conflict."
So there are two problems with your approach. The first is that it
will only work the first time and subsequent merges will likely run
into conflicts. The other is that you created new svn:externals on
the branch (as you should have) but then merged them down to your
trunk (as you should not have.) The svn:externals would be part of
the diff between the trunk and branch. That's why you have to start
at a revision beyond the point where you created the externals.
sean
On 9/28/05, Bill Dudney <[EMAIL PROTECTED]> wrote:
Hi Sean,
I was able to perform a merge from the branch to the trunk like this;
svn merge https://svn.apache.org/repos/asf/myfaces/impl/trunk
https://svn.apache.org/repos/asf/myfaces/impl/
branches/1_1_1 .
I did this command while inside the impl subproject under 'current'.
It worked like a champ and seems to be much easier (and safer) that
what you describe below.
Thoughts?
-bd-
On Sep 28, 2005, at 1:36 PM, Sean Schofield wrote:
I merged the latest branch changes down to the trunk. If there are
more branch changes between now and Friday morning (or as a
result of
the RC testing) then I will merge them down periodically.
Here are some important notes regarding the SVN merging process and
how we have our repository set up ... (Eventually this should
make its
way into a wiki)
You need to identify the start and end point of the set of changes
that you want to merge. For the first merge you do down to the
trunk
you want to be very careful in selecting the start point. You
should
select the revision number after the last revision related to the
creation of the branch and the setup of the new svn:externals. I
accidentally selected a revision after the creation of the branch
but
then noticed there were changes to subprojects that I didn't
think had
changed. Turns out I was merging in the svn:externals which
would be
a DISASTER. We don't want the externals from the branch to EVER
be in
the trunk. Otherwise we will be working with the branch code even
though we think we are modifying the trunk.
When committing its important to mention the direction of the merge
(ie. branch to trunk) and the revisions that were merged (ie.
r292022
- r292231). This will help make sure that only the new changes are
merged down the next time. So the next merge down can be (r292232 -
???) where ??? = the latest revision number at the moment.
sean
