Mercurial > hg
view tests/test-symlink-basic.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 | b9e0ddb04c5c |
children |
line wrap: on
line source
abort: dangling: file not tracked! changeset: 0:cabd88b706fc tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 files: dangling description: add symlink 2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling % rev 0: dangling -> nothing % rev 1: dangling -> void % modifying link dangling -> empty % reverting to rev 0: reverting dangling dangling -> nothing % backups: dangling.orig -> empty 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % copies copying dangling to dangling2 A dangling2 dangling dangling -> void dangling2 -> void % issue995 0 files updated, 0 files merged, 0 files removed, 0 files unresolved