[Bug 6262] New: divergence on one side after split infects other side

mercurial-bugs at mercurial-scm.org mercurial-bugs at mercurial-scm.org
Wed Jan 29 19:01:13 UTC 2020


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

            Bug ID: 6262
           Summary: divergence on one side after split infects other side
           Product: Mercurial
           Version: default branch
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: evolution
          Assignee: bugzilla at mercurial-scm.org
          Reporter: martinvonz at google.com
                CC: mercurial-devel at mercurial-scm.org,
                    pierre-yves.david at ens-lyon.org
    Python Version: ---

Here's a test case that shows what I mean:

```
  $ hg init split-divergence
  $ cd split-divergence
  $ touch a b
  $ hg ci -Aqm stuff
  $ hg split -q a
  diff --git a/a b/a
  new file mode 100644
  $ hg touch .^
  1 new orphan changesets
  $ hg touch -A .^
  3 new content-divergent changesets
```

The last command there should have only create two content-divergent
changesets.

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


More information about the Mercurial-devel mailing list