[Bug 6360] New: hg update which includes merging of files has unwanted results

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[Bug 6360] New: hg update which includes merging of files has unwanted results

mercurial-bugs-2
https://bz.mercurial-scm.org/show_bug.cgi?id=6360

            Bug ID: 6360
           Summary: hg update which includes merging of files has unwanted
                    results
           Product: Mercurial
           Version: default branch
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: Mercurial
          Assignee: [hidden email]
          Reporter: [hidden email]
                CC: [hidden email]
    Python Version: ---

Can someone please confirm if I am only one facing this issue with `hg update`?
In following script notice that after `hg update` we still have merge state
stored on disk (which should be cleaned up) because of which `hg status` shows
that "#no unresolved merge conflicts". And `hg log` also has that second
parent.


  $ hg init repo
  $ cd repo
  $ echo a > a
  $ hg ci -Ama
  adding a
  $ echo aa >> a
  $ hg ci -m "update a"
  $ sed -i '1ia_first' a
  $ hg up '.^' --merge
  merging a
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  $ hg log -G
  %  changeset:   1:d729b13643a1
  |  tag:         tip
  |  user:        test
  |  date:        Thu Jan 01 00:00:00 1970 +0000
  |  summary:     update a
  |
  @  changeset:   0:cb9a9f314b8b
     user:        test
     date:        Thu Jan 01 00:00:00 1970 +0000
     summary:     a

  $ hg st -v
  M a
  # No unresolved merge conflicts.

--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel