On 28 May 2008, at 19:47, Mirko Hansen wrote:
9246
9254
9267+9268
9282
They were already merged, it's like this in the branch, maybe Harry
merged them before.
9388
This one doesn't fit to the current code. There is no piece of code
in the file gui.tcl like in the diff, so there should be no need to
merge it.
9670
There is no need to merge this one, as it is like the commit would
change it.
Thanks for taking care of it! :)
No problem :)
p.s.: I don't know yet how to merge with svn, all my previous merges
were manual, but I don't want to do it for those commits
since they don't seem so trivial, so if you could take care
of them, I'd appreciate it.
Usually you do it with
svn merge -r [sourcerev]:[destrev] [repository-url]
inside your checked out branch-repository, but the svn tool on
Debian Etch and Ubuntu Hardy seems to be buggy, it requests a
"wrong" URL from the server and so it doesn't work. Only my
TortoiseSVN on Windows doesn't have that problem.
But back to the merging: There are a few commits I noted where I
wasn't sure wether to merge them or not. So first question to
everybody: Is 0.97.1 only a bugfix release or a stable release? In
my opinion those two new features mentioned in the other mail, as
well as the new plugin events, should be in that version, so it
would be a stable release and not only bugfixing.
In addition to that the "alert only once per user" introduced in
9655 is also stable, it's a hidden feature but I would merge it, too.
9759-9761, the sorting of the DP files by square should go in 0.98
as it changes the profile structure and makes it backward-
incompatible like the relative paths thing.
Is there a progress window for the process that moves the DPs? That
would be necessary for us to include the feature. For me it took quite
a while to move the cache.. (I do have thousands of DPs though..)
9911, 9917, 9935, hiding the offline group, as long as it's stable,
could be merged, too. Tom said he wouldn't merge it, so I think we
leave it for 0.98
As of my latest rev (9987), the code is now stable.. It could be
comitted. I'm not sure if the lang keys have been updated, that would
be my only concern..
9385 confuses me a bit, it's marked as work in progess, but there is
no commit concerning that topic, or I'm simply blind ;)
9406-9408, 9411 and a few more: tclISF - that's inkdraw, right? Is
this some kind of bugfix or a better way to offer inkdraw? (sorry
for the stupid question, I never used that ...) Should this be
merged, too?
ISF (Ink Serialized Format) is the format used to encode the inkdraw
drawing so WLM users can see them. tclISF handles the conversion for
us. It seems to be stable.. I think it should be included.
9954 and some other: libgrowl for Mac - should this be merged, too?
Don't bother with this one.. Its a minor change, but I think we should
leave for 0.98..
TkCximage can be copied as it is from trunk I think. I skipped all
the commits concerning it as there should be no need for the commit
history in branch.
Mirko
Thanks,
KaKaRoTo
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Amsn-devel mailing list
Amsn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/amsn-devel
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/_______________________________________________
Amsn-devel mailing list
Amsn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/amsn-devel
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Amsn-devel mailing list
Amsn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/amsn-devel
