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

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

commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.
Matt Mackall - - Load All Authors

File last commit:

r3400:d2b55e3c default
r6385:0d4e068e default
Show More
test-merge-revert.out
23 lines | 611 B | text/plain | TextLexer
/ tests / test-merge-revert.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 eb43f19ff115
eb43f19ff115+
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
 r2029 reverting file1
Vadim Gelfer
forgot to rerun tests after changed backup extension to .orig....
 r2030 ? file1.orig
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 eb43f19ff115
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
forgot to rerun tests after changed backup extension to .orig....
 r2030 ? file1.orig
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 016807e6fdaf tip
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
merge: if filemerge skips merge, report as updated
 r3400 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
forgot to rerun tests after changed backup extension to .orig....
 r2030 ? file1.orig
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 016807e6fdaf tip
Vadim Gelfer
forgot to rerun tests after changed backup extension to .orig....
 r2030 ? file1.orig
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 016807e6fdaf tip
Vadim Gelfer
forgot to rerun tests after changed backup extension to .orig....
 r2030 ? file1.orig
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 016807e6fdaf tip
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
forgot to rerun tests after changed backup extension to .orig....
 r2030 ? file1.orig
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 016807e6fdaf tip