[wx-dev] Re: Trunc - wxListCtrl - DoFreeze/Thaw - linker errors
ATS
asteinarson at gmail.com
Mon Mar 31 13:04:53 PDT 2008
> > I'm doing a sync of files before submitting a patch, so I have
> > to do this manually.
>
> Subversion is quite capable of merging upstream changes with your local
> modifications, you don't have to avoid it, really. That's the _point_ of
> using version control.
I suppose so and will look into it. So far, my patches have mostly
touched one or two files and updating those files manually (before
doing diff) has been practical. This time, some 10 files are affected
by the patch, so it becomes a bit more involved.
> Avoiding updates on patch files is counterproductive, because all
> submitted patches should be against the latest sources,
That's why I'm manually updating my sources. So that when I make
diff, I do it against the latest version of the file I changed.
When encountering a bug / problem, I work with the source files I
have on my disc. After testing for some time, I update relevant
sources to SVN and merge my changes into them. And retest.
It has worked without significant problems.
Doing a full SVN update can be costly in terms of time (my source and
3rd party libraries often break in some subtle ways). I've been making
it something like every 2nd month. It has usually meant spending a day
or two getting things working again. I don't want that type of activity
to take up a larger portion than that.
Regards
// ATS.
More information about the wx-dev
mailing list