[Bug 4026] New: some bug on merge

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Mon Aug 26 23:32:37 CDT 2013


http://bz.selenic.com/show_bug.cgi?id=4026

          Priority: normal
            Bug ID: 4026
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: some bug on merge
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: alex at ua2web.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: unspecified
         Component: Mercurial
           Product: Mercurial

I either need explanations or instructions how to provide more information for
you to reproduce the bug on clean repos (this one contains customer files which
I can not share)

the problem which I experience and which I believe is a bug is this one:

I am trying to merge:

servicekit.hg $ hg branches
default                      254:b5a41ecea3ef
25089_staticfiles            250:6bad7883f879
25086_df_customerjob         243:54b4bafe6056
bug_24981                    229:26d4c091eb64
servicekit.hg $ hg branch
default
servicekit.hg $ hg merge 25089_staticfiles
resolving manifests
getting .hgignore
getting servicekit/home/views.py
getting servicekit/templates/base/skeleton.html
getting servicekit/urls.py
merging servicekit/default_settings.py
*ERROR*: File
`'/mnt/crypted/disk2/avk/dev/servicekit/servicekit.hg/servicekit/default_settings.py.orig''
does not exist or is not readable
merging servicekit/default_settings.py failed!
4 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
servicekit.hg $ ls -l
/mnt/crypted/disk2/avk/dev/servicekit/servicekit.hg/servicekit/default_settings.py.orig
-rw-r--r-- 1 avk avk 7162 Aug 27 07:30
/mnt/crypted/disk2/avk/dev/servicekit/servicekit.hg/servicekit/default_settings.py.orig
servicekit.hg $ 

Looks like the file is created but then it can not be read...
Not clear why and also it makes it difficult for me to merge because neither
the .orig neither the merged file contains the correct changes in it.

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


More information about the Mercurial-devel mailing list