Mercurial > hg

view tests/test-add.out @ 5736:6e79d5e0e541

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bisect: keep history of all bad revisions - use a single state dict - find the minimum bad revision
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Dec 2007 23:55:40 -0600
parents 883d887c6408
children 5af5f0f9d724
line wrap: on
line source

adding a
? a
adding a
A a
A a
? b
A a
A b
% should fail
b already tracked!
A a
A b
% should fail
a already tracked!
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
warning: conflicts during merge.
merging a
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 2
  hg merge 1
M a
% should fail
a already tracked!
M a
% issue683
R a
M a
c does not exist!
d does not exist!
M a
A c