You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jena.apache.org by xristy <gi...@git.apache.org> on 2018/01/06 18:17:06 UTC
[GitHub] jena pull request #339: resolve JENA-1459 add jena text highlighting
GitHub user xristy opened a pull request:
https://github.com/apache/jena/pull/339
resolve JENA-1459 add jena text highlighting
This PR adds the highlighting feature describe in JENA-1459. This PR includes unit tests for the highlighting feature.
Once the PR is approved, I'll submit an update to the jena-text documentation.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/BuddhistDigitalResourceCenter/jena JENA-1459-Highlighting
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/jena/pull/339.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #339
----
commit 1299d653d295f3dfebaeb25984d8e5d55c3f5245
Author: Chris Tomlinson <ct...@...>
Date: 2018-01-06T17:53:50Z
Merged Highlighting
----
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by xristy <gi...@git.apache.org>.
Github user xristy commented on the issue:
https://github.com/apache/jena/pull/339
Good grief!. Yes the conflicts are with PR [#335](https://github.com/apache/jena/pull/335). I apparently merged too fast when I saw the approval for 335 and proceeded with the development of the highlight.
When I issued this PR no conflicts were showing so I thought all was ok. I had prepared a squashed branch per prior requests.
What is the procedure to remedy?
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by ajs6f <gi...@git.apache.org>.
Github user ajs6f commented on the issue:
https://github.com/apache/jena/pull/339
Relax-- it's not nearly as bad as all that. :grin: I often say that having to rebase PRs a lot is good-- it means the project is lively and the code is evolving.
For me, the trick (as almost always with git) was to remember that you are making/managing/corralling _deltas_ (aka commits), not versions. A branch can be thought of as a chain of deltas that starts somewhere and ends with a specific commit. Rebasing means taking a chain of commits that ends one branch and swapping what comes before it to be another branch. So in this case, you would have swapped the prefix of your branch (which has all the commits in master _except_ those that were in #335) for master itself. You would have had to do exactly the same adjustments, but you would have ended up with a series of commits that appeared (from the POV of seeing how deltas add up to change) as though you had begun work after #335 merged, which makes for a cleaner public history. Of course your commits always keep their metadata, so we will always actually know when they occurred in clock time.
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by xristy <gi...@git.apache.org>.
Github user xristy commented on the issue:
https://github.com/apache/jena/pull/339
What was the error? I puzzled that I was not seeing it.
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by afs <gi...@git.apache.org>.
Github user afs commented on the issue:
https://github.com/apache/jena/pull/339
Done! (One trivial syntax error fixed.)
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by ajs6f <gi...@git.apache.org>.
Github user ajs6f commented on the issue:
https://github.com/apache/jena/pull/339
Cool. That's essentially an in-line version of the same workflow, minus the rebase. That means you end up with an extra no-real-content commit (https://github.com/apache/jena/pull/339/commits/c9453b4c835ac7ab3eb9b0c9bcf8857d11b1a8b8) but you get where you need to be.
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by xristy <gi...@git.apache.org>.
Github user xristy commented on the issue:
https://github.com/apache/jena/pull/339
I'm glad it was comparatively simple. I was not looking forward to experimenting with rebasing in public -;)
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by xristy <gi...@git.apache.org>.
Github user xristy commented on the issue:
https://github.com/apache/jena/pull/339
Thanks for the help. I appreciate it.
---
[GitHub] jena pull request #339: resolve JENA-1459 add jena text highlighting
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/jena/pull/339
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by xristy <gi...@git.apache.org>.
Github user xristy commented on the issue:
https://github.com/apache/jena/pull/339
Thanks for fixing. Maybe that got introduced when I "corrected" the conflicts a couple of days ago since I did that inline - I suppose I won't used that approach again, otherwise the tools should have detected it at my end.
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by afs <gi...@git.apache.org>.
Github user afs commented on the issue:
https://github.com/apache/jena/pull/339
TS_Text.java, line 54 had a leading backtick character. I thought I could safely fix it :-)
+` , TestTextHighlighting.class
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by xristy <gi...@git.apache.org>.
Github user xristy commented on the issue:
https://github.com/apache/jena/pull/339
They were simple enough to fix inline via the github tool.
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by ajs6f <gi...@git.apache.org>.
Github user ajs6f commented on the issue:
https://github.com/apache/jena/pull/339
That is one prob with using the Github on-line editors. But they _are_ convenient! I use them for corrections to human-centric docs like READMEs, etc.
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by afs <gi...@git.apache.org>.
Github user afs commented on the issue:
https://github.com/apache/jena/pull/339
There are some conflicts (due to PR #335, I think).
Is this simple to resolve? Is that because this PR includes some of the other one?
---
[GitHub] jena issue #339: resolve JENA-1459 add jena text highlighting
Posted by ajs6f <gi...@git.apache.org>.
Github user ajs6f commented on the issue:
https://github.com/apache/jena/pull/339
It's no big deal-- happens all the time! Do you know how to rebase and resolve conflicts in Git?
https://help.github.com/articles/resolving-merge-conflicts-after-a-git-rebase/
https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
---