[
https://issues.apache.org/jira/browse/CONNECTORS-1196?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15926562#comment-15926562
]
Karl Wright edited comment on CONNECTORS-1196 at 3/15/17 5:01 PM:
------------------------------------------------------------------
[~kishorekumar] With svn, the only safe way to pull in changes from trunk is to
go through the process I described, although it can be simplified if your
source branch is intact to this:
{code}
svn copy https://svn.apache.org/repos/asf/manifoldcf/trunk
https://svn.apache.org/repos/asf/manifoldcf/branches/my_new_branch
svn co https://svn.apache.org/repos/asf/manifoldcf/branches/my_new_branch
cd my_new_branch
svn merge https://svn.apache.org/repos/asf/manifoldcf/branches/my_old_branch
svn commit
{code}
The procedure for moving the new branch to replace the old branch is as follows:
{code}
svn remove https://svn.apache.org/repos/asf/manifoldcf/branches/my_old_branch
svn move https://svn.apache.org/repos/asf/manifoldcf/branches/my_new_branch
https://svn.apache.org/repos/asf/manifoldcf/branches/my_old_branch
{code}
With git, there is a single operation for all of this called "rebase". But
with svn, you really never want to merge the wrong way unless you're looking
for trouble.
was (Author: [email protected]):
[~kishorekumar] With svn, the only safe way to pull in changes from trunk is to
go through the process I described, although it can be simplified if your
source branch is intact to this:
{code}
svn copy https://svn.apache.org/repos/asf/manifoldcf/trunk
https://svn.apache.org/repos/asf/manifoldcf/branches/my_new_branch
svn merge https://svn.apache.org/repos/asf/manifoldcf/branches/my_old_branch
svn commit
{code}
The procedure for moving the new branch to replace the old branch is as follows:
{code}
svn remove https://svn.apache.org/repos/asf/manifoldcf/branches/my_old_branch
svn move https://svn.apache.org/repos/asf/manifoldcf/branches/my_new_branch
https://svn.apache.org/repos/asf/manifoldcf/branches/my_old_branch
{code}
With git, there is a single operation for all of this called "rebase". But
with svn, you really never want to merge the wrong way unless you're looking
for trouble.
> Proposal to update Manifold Crawler UI
> --------------------------------------
>
> Key: CONNECTORS-1196
> URL: https://issues.apache.org/jira/browse/CONNECTORS-1196
> Project: ManifoldCF
> Issue Type: Improvement
> Components: Framework core
> Affects Versions: ManifoldCF next
> Reporter: Kishore Kumar
> Assignee: Kishore Kumar
> Fix For: ManifoldCF next
>
> Attachments: Bandwidth Report.png, Index.jsp.png, List
> Repository.png, Report.png, View.png
>
>
> Hi,
> I have been working on a new User Interface for ManifoldCF.
> This UI is based on Bootstrap, jQuery and some other opensource scripts.
> Only the index.jsp will be loaded once and other page are rendered using AJAX
> call, making it more responsive and modern.
> Please find the attached screenshots.
> *Backward compatibility:*
> Since most of our tab comes from connectors, those tabs will be displayed as
> it is with no immediate attention required. (see sample screenshot attached)
> *What next?*
> In future we can add Charts to our reports where ever applicable, so that it
> will be more user friendly & informative for end users.
> Can make use of Web socket to notify exception or error to users as
> Notifications.
> *Browser compatibility*
> Has been tested with most latest browser and IE10, will try to add support
> for IE8 with acceptable degradation.
> Any suggestion, concern much appreciated.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
