Mercurial Mercurial > hg / 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 Steve Borho <steve@borho.org>
Fri, 05 Feb 2010 04:33:08 -0600
branchstable
changeset 10315 be324d31b6c5
parent 9468 b2310903c462
permissions -rw-r--r--
commands: label from user is in local encoding repo.branchtags().keys() are in UTF-8, so the label should be converted to UTF-8 before checking for a naming conflict. Keep the original label for ui.status()
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








9468






b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message



Stuart W Marks <smarks@smarks.org>


parents: 
7821

diff
changeset




     9


use 'hg resolve' to retry unresolved file merges or 'hg update -C' 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















Mercurial