[Bug 4875] New: merge does automatically move file from origin directory to another

[mercurial-bugs at selenic.com]

https://bz.mercurial-scm.org/show_bug.cgi?id=4875

            Bug ID: 4875
           Summary: merge does automatically move file from origin
                    directory to another
           Product: Mercurial
           Version: unspecified
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: Bastian.Wassermann at multivac.de
                CC: mercurial-devel at selenic.com

I dont know whether its right or consequent, but in my opinion it is wrong.

When i move all files of a directory into many others, and then update back and
add a new file in this origin directory. After merge, the new file got moved in
an other directory without asking me which one or does not leave it at origin.

This is sequence (in windows cmd) which reproduces this behaviour
  hg init
  md first_dir
  echo first line>first_dir/first_file.txt
  hg add first_dir/first_file.txt
  hg commit -m "This is first"
  echo second line>>first_dir/first_file.txt
  echo first line>>first_dir/second_file.txt
  hg add first_dir/second_file.txt
  hg commit -m "This is second"
  hg move first_dir/first_file.txt new_dir/first_file.txt
  hg move first_dir/second_file.txt new_second_dir/second_file.txt
  hg commit -m "This is third"
  hg update 0
  echo line>>first_dir/third_file.txt
  hg add first_dir/third_file.txt
  hg branch first_branch
  hg commit -m "This is forth"
  hg merge 2
  hg commit -m "This is merge"

I expected that the merge either leaves the first_dir/third_file.txt in
first_dir, or asks where to put this file. But Mercurial does automatically
move the first_dir/third_file.txt to new_dir/third_file.txt.

-- 
You are receiving this mail because:
You are on the CC list for the bug.