Mercurial > hg
view tests/test-issue842.out @ 11237:feb2a58fc592 stable
record: check that we are not committing a merge before patch selection
It might sound like a good idea to use record to filter changes when merging.
If someone attemps this, it's better to tell her "no" right ahead, before the
patch generation/line selection, so she does not spend time doing it just to
receive a red light after that (sometimes rather long) process.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Mon, 31 May 2010 17:13:15 +0900 |
parents | 4b0c9c674707 |
children |
line wrap: on
line source
adding a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved % should issue warning adding a created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved % should not issue warning 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch testing % should not issue warning