2007-08-21 04:13:32 +04:00
|
|
|
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
|
2008-03-21 13:06:02 +03:00
|
|
|
created new head
|
2007-08-21 04:13:32 +04:00
|
|
|
merging a
|
2008-02-04 04:29:05 +03:00
|
|
|
warning: conflicts during merge.
|
2007-08-21 04:13:32 +04:00
|
|
|
merging a failed!
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
2009-03-04 22:06:16 +03:00
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
|
2007-08-21 04:13:32 +04:00
|
|
|
M a
|
2008-02-04 04:29:05 +03:00
|
|
|
? a.orig
|
2007-08-21 04:13:32 +04:00
|
|
|
% should fail
|
|
|
|
a already tracked!
|
|
|
|
M a
|
2008-02-04 04:29:05 +03:00
|
|
|
? a.orig
|
2007-08-21 04:13:32 +04:00
|
|
|
% issue683
|
|
|
|
R a
|
2008-02-04 04:29:05 +03:00
|
|
|
? a.orig
|
2007-08-21 04:13:32 +04:00
|
|
|
M a
|
2008-02-04 04:29:05 +03:00
|
|
|
? a.orig
|
2007-12-24 14:14:43 +03:00
|
|
|
c does not exist!
|
|
|
|
d does not exist!
|
|
|
|
M a
|
|
|
|
A c
|
2008-02-04 04:29:05 +03:00
|
|
|
? a.orig
|