Mercurial > public > mercurial-scm > hg-stable
diff tests/test-merge-types.t @ 18505:9de9727cea53 stable
merge: fix UnboundLocalError (issue3791)
A wrong variable name was introduced in 384df4db6520 for a case without test
coverage.
The variable name is fixed and a test case is introduced.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 30 Jan 2013 19:29:36 +0100 |
| parents | 384df4db6520 |
| children | 5ed6a375e9ca |
line wrap: on
line diff
--- a/tests/test-merge-types.t Mon Jan 28 19:05:35 2013 +0900 +++ b/tests/test-merge-types.t Wed Jan 30 19:29:36 2013 +0100 @@ -197,6 +197,26 @@ f is a plain file with content: f +Test removed 'x' flag merged with content change - both ways + + $ hg up -Cqr0 + $ echo change > f + $ hg ci -qm3 + $ hg merge -r1 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ tellmeabout f + f is a plain file with content: + change + + $ hg up -qCr1 + $ hg merge -r3 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ tellmeabout f + f is a plain file with content: + change + $ cd .. Test merge with no common ancestor: