I just realised that combining merges with branch edits in commits is not such a hot idea. The modifications I’ve made are buried in with the merge data. I won’t do that any more.
What changesets of yours still need to be merged to the trunk? I have
changelogs from 2941, 2972, 2976, and 2978, but I don’t know if these
are intended for me to merge.
You can merge all of them. At no point have I left my branch in an
non-mergeable state. I wasn’t sure what the policy on that was, but
that’s what I’ve been doing.
I haven’t touched anything outside of tools.imports except for one
method I added to GameModule and ReturnToStack that fixes two obscure
problems I was having with imported modules.
Would you prefer I let you know when I want them merged?
- M.
On 03/02/2008, uckelman messages@forums.vassalengine.org wrote:
Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org
Post generated using Mail2Forum (mail2forum.com)
Thus spake “Michael Kiefte”:
It’s up to you. I use my branches for troubleshooting a lot, so I commit
changes in order to atomize them. Frequently HEAD on my branches doesn’t
work at all.
Yes. Otherwise I have to intuit it, and I’m not very good at that.
–
J.
Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org
Post generated using Mail2Forum (mail2forum.com)
Typically I demand psychic powers from my collaborators, but I’ll let
this one go.
I’ll let you know about merges then. In retrospect, I guess it
doesn’t matter if I combine merges with edits. You’d probably just do
a diff between my branch and the trunk, otherwise, you’d actually have
to read all those svn e-mails.
- M.
Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org
Post generated using Mail2Forum (mail2forum.com)
Thus spake “Michael Kiefte”:
I do read the commit notifications. That’s why I set them up in the first
place.
–
J.
Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org
Post generated using Mail2Forum (mail2forum.com)
Okay, I’ll make it easy then.
- M.
P.S.: can you recommend a good Java profiler?
On 03/02/2008, Joel Uckelman uckelman@nomic.net wrote:
Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org
Post generated using Mail2Forum (mail2forum.com)