tests/test-merge5.out
author Steve Losh <steve@stevelosh.com>
Sun, 18 Apr 2010 18:18:19 -0400
changeset 10957 0d5f139b23c1
parent 9717 68a1b9d0663e
permissions -rw-r--r--
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Switching to --branch makes log consistent with push/pull and make more sense given the actual behavior of the option (you can specify -b multiple times to include multiple branches). This change also adds some tests for 'hg log -b'.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved