Re: SVN:(JC)[67799] Remove build directory

3 views
Skip to first unread message

Paul Cornett

unread,
May 27, 2011, 12:31:56 PM5/27/11
to wx-...@googlegroups.com, John Chain
nor...@wxsite.net wrote:
> Revision: 67799
> http://trac.wxwidgets.org/changeset/67799
> Author: JC
> Date: 2011-05-26 23:31:48 -0700 (Thu, 26 May 2011)
> Log Message:
> -----------
> Remove build directory
>
> Removed Paths:
> -------------
> wxWidgets/branches/SOC2011_GTK3/build/

Hi John,
a new port will almost certainly need changes to at least the
bakefiles, which you just removed. As Vadim said, removing these
directories looks like a bad idea, and I think it would be best to
follow his suggestion to start over and recreate the branch.

John Chain

unread,
May 27, 2011, 12:55:02 PM5/27/11
to Paul Cornett, wx-...@googlegroups.com
Hi Paul,

Thanks for pointing that out. The reason I deleted those directories and created symbolic links is that I want to pick up the latest changes from the trunk. But I was also in hesitation between symbolic link and real copy since real copy is a safer move. I think I will stick to real copy. I will recreate the branch.

Thanks,
JC

Vadim Zeitlin

unread,
May 27, 2011, 12:59:10 PM5/27/11
to wx-...@googlegroups.com
On Fri, 27 May 2011 11:55:02 -0500 John Chain <jch...@gmail.com> wrote:

JC> Thanks for pointing that out. The reason I deleted those directories and
JC> created symbolic links is that I want to pick up the latest changes from the
JC> trunk. But I was also in hesitation between symbolic link and real copy
JC> since real copy is a safer move. I think I will stick to real copy. I will
JC> recreate the branch.

You shouldn't do any explicit copies, just use svn to merge the trunk into
your branch from time to time. IOW things are actually much simpler than
you think they are, you don't have anything special to do to keep your
branch up to date other than just use merge periodically.

Regards,
VZ

Robin Dunn

unread,
May 27, 2011, 2:03:22 PM5/27/11
to wx-...@googlegroups.com
On 5/27/11 9:55 AM, John Chain wrote:
> Hi Paul,
>
> Thanks for pointing that out. The reason I deleted those directories and
> created symbolic links is that I want to pick up the latest changes from
> the trunk. But I was also in hesitation between symbolic link and real
> copy since real copy is a safer move. I think I will stick to real copy.
> I will recreate the branch.

Doing merges of changes made in the trunk into your branch is easy
(well, not overly difficult might be a better way to say it) and is one
of the main reasons to use tools like Subversion. Keep track of the
revision number that you use to make your new branch, and that will help
make it a little easier. If you need help when it comes time to do a
merge then let me know.

--
Robin Dunn
Software Craftsman
http://wxPython.org

JChain

unread,
May 27, 2011, 3:17:05 PM5/27/11
to wx-...@googlegroups.com
Thank for all your guy's help. I have reverted my deletion that I committed last night.

JC
Reply all
Reply to author
Forward
0 new messages