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 165479 - merge doesn't work - wrong target is picked up on 6.7, works fine on 6.5
Summary: merge doesn't work - wrong target is picked up on 6.7, works fine on 6.5
Status: VERIFIED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Subversion (show other bugs)
Version: 6.x
Hardware: All All
: P2 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-05-19 11:49 UTC by Masaki Katakai
Modified: 2009-05-20 12:09 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
screenshot - merge window (60.19 KB, image/jpeg)
2009-05-19 11:51 UTC, Masaki Katakai 		Details
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Masaki Katakai 2009-05-19 11:49:51 UTC 
Product Version: NetBeans IDE Dev (Build 200905190201)
Java: 1.6.0_13; Java HotSpot(TM) Client VM 11.3-b02
System: Windows XP version 5.1 running on x86; MS932; en (nb)
subversion client : svn, version 1.6.2 (r37639) of collabnet

1. Start NetBeans
2. checkout JavaApplication7 project from https://kenai.com/svn/nbl10ntest~testsrc
3. Open the project after checkout
4. Select the project on project window and select Subversion > Merge Changes...
5. Enter the following information, trying to merge changes from https://kenai.com/svn/nbl10ntest~testsrc/JavaApplication4

Both JavaApplication7 and JavaApplication4 has the same project name.

Merge From : One Repository Folder,
    Repository Folder : JavaApplication4 (JavaApplication7 was copied from the JavaApplication4)
  Starting Revision : 19
  Ending Revision : 19

  Preview is showing:
   from : https://kenai.com/svn/nbl10ntest~testsrc/JavaApplication4
   to : C:\Documents and Settings\test\My Documents\NetBeansProjects\JavaApplication7

6. click Merge button

Here is the output:

merge --depth=infinity -r19:19 https://kenai.com/svn/nbl10ntest~testsrc/JavaApplication7 C:/Documents and
Settings/test/My Documents/NetBeansProjects/JavaApplication7

This is not correct. I selected "JavaApplication4" so "https://kenai.com/svn/nbl10ntest~testsrc/JavaApplication7" should
be "..../JavaApplication4".

When I tried the same operation on NetBeans IDE 6.5.1 (Build 200903060201), it works properly. Output is:

merge https://kenai.com/svn/nbl10ntest~testsrc/JavaApplication4 -r 19:19 C:\Documents and Settings\test\My
Documents\ABC\JavaApplication7 --config-dir C:\Documents and Settings\test\.netbeans\6.5\config\svn\config --non-interactive
Comment 1 Masaki Katakai 2009-05-19 11:51:47 UTC 
Created attachment 82377 [details]
screenshot - merge window
Comment 2 Ondrej Vrabec 2009-05-19 12:29:57 UTC 
fixing: cdev #3806b9654e8f
BTW, thanks for revealing this bug before the release. A similar issue was fixed in 'switch to' action, but the merge
action somehow avoided our notice.

Please verify the fix
Comment 3 Quality Engineering 2009-05-20 07:18:07 UTC 
Integrated into 'main-golden', will be available in build *200905200201* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/3806b9654e8f
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #165479 - merge doesn't work - wrong target is picked up on 6.7, works fine on 6.5
replace the last segment in the file url only for multi-file DOs
Comment 4 Masaki Katakai 2009-05-20 12:08:59 UTC 
Thank you Ondrej! I verified the fix on build 200905200201.
Comment 5 Masaki Katakai 2009-05-20 12:09:44 UTC 
verified.