Details
-
Suggestion
-
Resolution: Unresolved
Description
EyeQL should have a way to query merged SVN revisions vs. native to the branch, and produce a difference between two branches presenting revisions missing in selected branch.
Presently EyeQL doesn’t distinguish (for SVN) native revision (change made in the branch) from a revision created as a result of merger.
There are mixed case situations when a revision includes both native changes and merged revisions yet from reconciliation point of view those should be accounted for as merged revisions as well.
SVN merged revision gets new revision number but SVN metadata and SVN log command resulting xml structure clearly indicate what branch (path) and revision the merged copy comes from.
Introduction of new 'merged' (vs. modified or added) qualifier should limit query return to post-branching (just like modified) merged (vs. native) revision scope.
it’s essential that return includes original revision and path along with newly created revision in result of merger.
New revision may have several original revisions included so its possible that native revision will be listed several times along with every merged revision.
In order to reconcile 2 branches 2 reports would be necessary to run
1. Merged revisions report
2. Partially or non-merged revisions report
Below are query examples (totally made up)
— list revisions modified in A but not merged into B —
select revisions from dir "/"
where modified on branch A and not merged on branch B
order by date desc
group by csid
return count(revisions), csid, comment, author
— list revisions modified in A and merged into B —
select revisions from dir "/"
where modified on branch A and merged on branch B
order by date desc
group by csid
return count(revisions), csid, comment, author
my 'toy' query (albeit not resolving my issue) does show the report in format very close to what I envision:
• Row Count as link to changeset group contents
• Changeset ID as link to the change set and set size displayed as well.
• Comment with JIRA issue link URL.
Here's the query:
select revisions from dir "/"
where
modified on branch A or
modified on branch B
order by date desc
group by csid
return count(revisions), csid, comment, author
Attachments
Issue Links
- is related to
-
FE-3568 Subversion Merge Tracking on the Commit Graph
- Closed