[Bug 4860] New: 'hg pull'ing a fix for divergent bookmarks doesn't work if the fix used obsolete markers

[mercurial-bugs at selenic.com]

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

            Bug ID: 4860
           Summary: 'hg pull'ing a fix for divergent bookmarks doesn't
                    work if the fix used obsolete markers
           Product: Mercurial
           Version: default branch
          Hardware: All
                OS: All
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: bookmarks
          Assignee: bugzilla at selenic.com
          Reporter: durin42 at gmail.com
                CC: mercurial-devel at selenic.com

I was on the revision marked @ when I did a pull from the clowncopter, after I
already had a divergent @clowncopter bookmark:

d76dc970 o clowncopter/default tip @ draft localrepo: recreate phasecache if
changelog was modified (issue4855)
         |
492c2d43 o draft progress: force a repaint of a printed progress bar after a
clear()
         |
8970eaaa o draft test: fix test-bundle2-format test
         |
795f02a2 @ bundle2: allow compressed bundle
         |
d19f67dc o test-bundle2: dump bundle content using f --hexdump
         |
2cba9e5d | x @clowncopter draft localrepo: recreate phasecache if changelog was
modified (issue4855)
         | |
45386906 | x draft progress: force a repaint of a printed progress bar after a
clear()
         | |
0e0c6b90 | x draft bundle2: allow compressed bundle
         | |
10d3a322 | x draft test-bundle2: dump bundle content using f --hexdump
         |/
05871262 o treemanifest: rework lazy-copying code (issue4840)

since I pulled from the clowncopter, we should probably have noticed that I was
resolving the divergent @ bookmark.

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