Mercurial > hg
view tests/test-grep.out @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | 80cc4b1a62d0 |
children | 717c35d55fb3 |
line wrap: on
line source
% pattern error grep: invalid match pattern: nothing to repeat % simple port:4:export port:4:vaportight port:4:import/export % all port:4:4:-:spam:import/export port:3:4:+:eggs:import/export port:2:1:-:spam:import port:2:2:-:spam:export port:2:1:+:spam:export port:2:2:+:spam:vaportight port:2:3:+:spam:import/export port:1:2:+:eggs:export port:0:1:+:spam:import % other port:4:import/export % follow port:0:import port2:6:4:+:eggs:deport port:4:4:-:spam:import/export port:3:4:+:eggs:import/export port:2:1:-:spam:import port:2:2:-:spam:export port:2:1:+:spam:export port:2:2:+:spam:vaportight port:2:3:+:spam:import/export port:1:2:+:eggs:export port:0:1:+:spam:import color:3:orange color:3:+:orange color:2:-:orange color:1:+:orange % match in last line without newline adding noeol % last character omitted in output to avoid infinite loop noeol:4:no infinite loo % issue 685 adding color colour:1:octarine color:0:octarine colour:1:octarine % issue 337 adding color 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved color:3:-:red color:1:+:red