Mercurial Mercurial > mercurial / 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 Edouard Gomez <ed.gomez@free.fr>
Sun, 04 Jan 2009 02:36:48 +0100
changeset 7583 77fec2d270ae
parent 6888 7c36a4fb05a3
child 7821 9fe7e6acf525
permissions -rw-r--r--
convert/gnuarch: parse continuation-of revisions in gnuarch source In GNU Arch, continuation-of was often used for: - tagging revisions - continue working on a project in a new archive, because arch was scaling poorly in revision numbers (cat-logs were slow to be parsed and scanned through) - very similar to the previous point, fork his own branch of a project. Parsing this header information will allow to 'follow' new history because it often hints at older/forked/personal revision trees. This patch however just implements the parsing of the continuation-of header. A followup patch will implement the proper use of this new information.
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














mercurial