NH-3534

[rjperes]

https://nhibernate.jira.com/browse/NH-3534
Added unit test

[hazzik]

Again leaked commits... But please do not close the pull request. Just do following sequence (assuming that upstream is https://github.com/nhibernate/nhibernate-core.git and origin is https://github.com/rjperes/nhibernate-core.git) :

$ git fetch upstream
$ git checkout NH-3534
$ git reset upstream/master --hard
$ git cherry-pick ff8767b
$ git push origin NH-3534:NH-3534 -f

[rjperes]

C:\nhibernate-core>git reset upstream/master --hard
fatal: ambiguous argument 'upstream/master': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git [...] -- [...]'

Any thoughts?

[rjperes]

What about this? It will probably be easier for me if I just close this pull request and create a new one.
Lesson learnt: should learn Git! ;-)

[hazzik]

What is the output of

$ git remote -v ?
$ git branch -r

[rjperes]

C:\nhibernate-core>git remote -v
origin https://github.com/rjperes/nhibernate-core.git (fetch)
origin https://github.com/rjperes/nhibernate-core.git (push)

C:\nhibernate-core>git branch -r
origin/1.2.x
origin/2.0.x
origin/2.1.x
origin/3.3.x
origin/3.4.x
origin/HEAD -> origin/master
origin/NH-1440
origin/NH-1705
origin/NH-2823
origin/NH-2888
origin/NH-2890
origin/NH-3110
origin/NH-3402
origin/NH-3404
origin/NH-3415
origin/NH-3435
origin/NH-3448
origin/NH-3485
origin/NH-3488-1
origin/NH-3534
origin/NH-3575
origin/NH-3606
origin/NH-3607
origin/NH-3612
origin/NH-3619
origin/NH-3657
origin/NH-3658
origin/NH-3659
origin/NH-3667
origin/NH-3670
origin/NH-3671
origin/NH-3683
origin/NH2861-clean2
origin/master
origin/nh-2920
origin/nh-3402
origin/nh-3404
origin/nh-3607

[hazzik]

@rjperes, where is the upstream?

Ok, then new actions

$ git remote add upstream https://github.com/nhibernate/nhibernate-core.git
$ git fetch --all
$ git checkout NH-3534
$ git reset upstream/master --hard
$ git cherry-pick ff8767b
$ git push origin NH-3534:NH-3534 -f

[rjperes]

Another attempt, still no luck:

C:\nhibernate-core>git remote add upstream https://github.com/nhibernate/nhibernate-core.git

C:\nhibernate-core>git fetch --all
Fetching origin
Fetching upstream
remote: Counting objects: 5743, done.
remote: Compressing objects: 100% (4539/4539), done.
remote: Total 5743 (delta 1259), reused 3153 (delta 1147)
Receiving objects: 100% (5743/5743), 4.13 MiB | 1.49 MiB/s, done.
Resolving deltas: 100% (1259/1259), done.
From https://github.com/nhibernate/nhibernate-core

• [new branch] 1.2.x -> upstream/1.2.x
• [new branch] 2.0.x -> upstream/2.0.x
• [new branch] 2.1.x -> upstream/2.1.x
• [new branch] 3.3.x -> upstream/3.3.x
• [new branch] 3.4.x -> upstream/3.4.x
• [new branch] NH-2888 -> upstream/NH-2888
• [new branch] NH2861-clean2 -> upstream/NH2861-clean2
• [new branch] master -> upstream/master
• [new tag] 3.4.0.GA -> 3.4.0.GA
• [new tag] 4.0.0.GA -> 4.0.0.GA

C:\nhibernate-core>git checkout NH-3534
Branch NH-3534 set up to track remote branch NH-3534 from origin.
Switched to a new branch 'NH-3534'

C:\nhibernate-core>git reset upstream/master --hard
Checking out files: 100% (4660/4660), done.
HEAD is now at 3e59812 Merge branch 'NH-3383'

C:\nhibernate-core>git cherry-pick ff8767b
error: could not apply ff8767b... Added unit test
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'

[rjperes]

The replacement for this is #322.