Mercurial > hg
view tests/test-merge-closedheads.out @ 10058:c829563b3118
cmdutil: extract file copies closure into templatekw
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 13 Dec 2009 18:06:24 +0100 |
parents | ca8d05e1f1d1 |
children | a5576908b589 |
line wrap: on
line source
adding foo adding bar adding baz 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % fail with three heads 0 files updated, 0 files merged, 0 files removed, 0 files unresolved abort: branch 'default' has 3 heads - please merge with an explicit rev % close one of the heads 1 files updated, 0 files merged, 1 files removed, 0 files unresolved % succeed with two open heads 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)