This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 153355 - easier merging from trunk
Summary: easier merging from trunk
Status: RESOLVED WORKSFORME
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Subversion (show other bugs)
Version: 6.x
Hardware: All All
: P1 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-11-18 07:05 UTC by comboy
Modified: 2011-10-06 14:22 UTC (History)
0 users

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description comboy 2008-11-18 07:05:48 UTC
When I'm merging to stable branch from trunk, I always have to choose exact same path of file that I want to merge with,
but from the trunk. Maybe it would be possible to add something like "merge from trunk" option that would work with most
common repository organization (there may be some more clever algorithm to find tags,branches,trunk even if they are not
root directories in repo)

I know it's not a clear issue and it's questionable whether nb should guess so much about my repo, but if it's not
possible to add this functionality. then maybe you can give me some hints how to implement it myself? (I took a look at
some devs docs, just a few hints where to find what for this issue would save me a lot of time)

Thanks in advance for your time

Regards,
Kacper
Comment 1 sky123 2009-10-16 11:23:46 UTC
Maybe its possible to split path into two strings such as "/branchXXX/branchYYY" and "projectZZZ/etc/somefile" where the
first string could be saved for multiple usage. So we are changing "projectZZZ/etc/somefile" from Project explorer,
click merge, and use the same "/branchXXX/branchYYY" as in previous merges.
Comment 2 Ondrej Vrabec 2011-10-06 14:22:03 UTC
(trunk|branches|tags)/project repository structure is supported (in 7.1) and the repository url combo in the merge dialog works more clever in that case