##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

diffstat: don't fail on merges...
diffstat: don't fail on merges First version by Alexander Solovyov <piranha@piranha.org.ua>
Patrick Mezard - - Load All Authors

File last commit:

r6363:bbfebf75 default
r7664:3cc74ee7 default
Show More
test-imerge.out
71 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-imerge.out
History | Source | Raw |Copy content |Copy permalink
Brendan Cully
imerge extension and test
 r5044 adding bar
adding foo
Brendan Cully
imerge: handle renames
 r5109 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Brendan Cully
imerge extension and test
 r5044 % start imerge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Brendan Cully
imerge: gussy up dispatcher to support subcommand opts....
 r5111 U foo
Brendan Cully
imerge extension and test
 r5044 foo
bar
bar
bar
Brendan Cully
imerge: gussy up dispatcher to support subcommand opts....
 r5111 % status -v
Brendan Cully
imerge: handle renames
 r5109 merging e6da46716401 and 30d266f502e7
Brendan Cully
imerge: gussy up dispatcher to support subcommand opts....
 r5111 U foo (foo2)
Brendan Cully
imerge: handle renames
 r5109 % next
foo
Patrick Mezard
test-imerge: test resolve subcommand
 r6363 % resolve and unresolve
merging e6da46716401 and 30d266f502e7
R foo (foo2)
all conflicts resolved
merging e6da46716401 and 30d266f502e7
U foo (foo2)
Brendan Cully
imerge extension and test
 r5044 % merge next
Brendan Cully
imerge: handle renames
 r5109 merging foo and foo2
Brendan Cully
imerge extension and test
 r5044 all conflicts resolved
% unresolve
% merge foo
Brendan Cully
imerge: handle renames
 r5109 merging foo and foo2
Brendan Cully
imerge extension and test
 r5044 all conflicts resolved
% save
Patrick Mezard
imerge: replace "merge" with "internal:merge" when non-interactive
 r6362 % merge auto
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
merging foo2 and foo
warning: conflicts during merge.
merging foo2 failed!
U foo2
foo
<<<<<<< local
foo
=======
bar
>>>>>>> other
Brendan Cully
imerge extension and test
 r5044 % load
Brendan Cully
imerge: handle renames
 r5109 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
Brendan Cully
imerge extension and test
 r5044 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Brendan Cully
imerge: gussy up dispatcher to support subcommand opts....
 r5111 R foo
Brendan Cully
imerge extension and test
 r5044 all conflicts resolved
foo
Brendan Cully
imerge: handle renames
 r5109 changeset: 3:fa9a6defdcaf
Brendan Cully
imerge extension and test
 r5044 tag: tip
parent: 2:e6da46716401
Brendan Cully
imerge: handle renames
 r5109 parent: 1:30d266f502e7
Brendan Cully
imerge extension and test
 r5044 user: test
date: Thu Jan 01 00:00:03 1970 +0000
Brendan Cully
imerge: handle renames
 r5109 files: foo foo2
Brendan Cully
imerge extension and test
 r5044 description:
merged
Benoit Boissinot
improve error message for 'hg merge' when repo already at branchtip
 r5242 % nothing to merge -- tip
abort: there is nothing to merge
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
Brendan Cully
imerge extension and test
 r5044 % nothing to merge
abort: there is nothing to merge - use "hg update" instead
Joel Rosdahl
imerge: Fix unbound name error and add a test case
 r6213 % load unknown parent
Matt Mackall
revlog: report node and file when lookup fails
 r6228 abort: merge parent e6da46716401 not in repository