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 Patrick Mezard <pmezard@gmail.com>
Wed, 11 Nov 2009 18:31:42 +0100
changeset 9827 4fe9ca519637
parent 9468 b2310903c462
permissions -rw-r--r--
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Previous code was computing hunks then checking if these hunks could be ignored when taking whitespace/blank-lines options in accounts. This approach is simple but fails with hunks containing both whitespace and non-whitespace changes, the whole hunk is emitted while it can be mostly made of whitespace. The new version normalize the whitespaces before hunk generation, and test for blank-lines afterwards.
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















hg-stable