Hi, I am trying to get the <join> functionality provided by the patch in NH-466 into the source for 1.2GA. This is the one that lets one map multiple tables onto a single class (I have legacy data to deal with).

However I can't apply the patch to the source for 1.2GA because that revision gives my merge conflicts. I don't want to grab the trunk because it may be unstable. Is there a way for me to get this into a stable release?

Thank you.

The patch attached to NH-466 is based on a rather old revision and I am not surprised you got some conflicts. Try merging the following revisions from the trunk on to the 1.2GA source; easiest to do if you check out the 1.2GA source instead of downloading the source package:
* r2774
* r2836
* r2953
* r2955

If you still have problem doing that, email me directly, I can send you a 1.2GA binary with the above fix as well as NH-364 with the following revisions:
* r2952
* r2978

Thank you for the reply. I am new to subversion. If I grab the source under the tags directory for 1.2GA and then try to merge the changes from the trunk all the files are "skipped missing target".

What do I need to do in order to merge in the revisions? I tried grabbing revision 2798 from the trunk because that was the revision number beside the 1.2GA tag. However that seems odd since I need to merge in revision 2774 which is earlier. It gave a conflict anyway.

Thanks again for your help.

Assuming you are using TortoiseSVN, following are the steps:

1. Check out the 1.2GA source from here: https://nhibernate.svn.sourceforge.net/ ... nhibernate
2. Right click on the working copy and choose "TortoiseSVN | Merge..."
3. Point to the trunk as the "From URL": https://nhibernate.svn.sourceforge.net/ ... nhibernate
4. To merge r2774, enter 2773 and 2774 as the "From revision" and "To revision".
5. The above two steps tell TortoiseSVN that you are interested in merging the changes from r2773 to r2774 on the trunk.
6. Click "Dry Run" if you are interested in what TortoiseSVN would do
7. Click "Merge" to merge the changes.
8. Repeat for r2836 (i.e. from r2835 to r2836), r2953, and r2955.

That worked like a charm. Thank you again for all your help. I just convinced a company to throw away a junk "framework" called mere mortals.net that is basically a table data gateway (or DAO returning entities) pattern with a bunch of poorly constructed weirdness attached to the gateway classes. I need this functionality to deal effectively with their legacy data.

Again, thank you thank you thank you.

-Brian

Glad it worked. Cheers.