Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-commit-unresolved.out
author Martin Geisler <mg@daimi.au.dk>
Tue, 09 Sep 2008 21:32:39 +0200
changeset 7013 f56e788fa292
parent 6888 7c36a4fb05a3
child 7821 9fe7e6acf525
permissions -rw-r--r--
i18n: mark help strings for translation The gettext function is just another name for the normal _ function and it is used for translating docstrings when using _ would make pygettext.py output a warning.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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













7c36a4fb05a3
make commit fail when committing unresolved files



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     9


use 'hg resolve' to retry unresolved file merges













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















hg-stable