Mercurial > hg

annotate tests/test-commit-unresolved.out @ 7971:6ea0318daf75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue1495, corner case of adding empty files via patching
author Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
date Tue, 24 Mar 2009 23:28:55 +0000
parents 9fe7e6acf525
children b2310903c462
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6888
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
1 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
2 created new head
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
3
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
4 % Merging a conflict araises
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
5 merging A
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
6 warning: conflicts during merge.
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
7 merging A failed!
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
8 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
7821
9fe7e6acf525 merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents: 6888
diff changeset
9 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
6888
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
10
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
11 % Correct the conflict without marking the file as resolved
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
12 abort: unresolved merge conflicts (see hg resolve)
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
13
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
14 % Mark the conflict as resolved and commit