Mercurial > hg
view tests/test-merge4.t @ 12731:95514b58709d
context: narrow down filter special case in filectx.cmp()
cmp via filelog when encode filters are present, but only when
actually comparing to the working directory.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Thu, 14 Oct 2010 22:47:50 +0200 |
parents | 4c94b6d0fb1c |
children | 63c817ea4a70 |
line wrap: on
line source
$ hg init $ echo This is file a1 > a $ hg add a $ hg commit -m "commit #0" $ echo This is file b1 > b $ hg add b $ hg commit -m "commit #1" $ hg update 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo This is file c1 > c $ hg add c $ hg commit -m "commit #2" created new head $ hg merge 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ rm b $ echo This is file c22 > c $ hg commit -m "commit #3"