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

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

tests: remove unneeded -d flags...
tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.
Matt Mackall - - Load All Authors

File last commit:

r11175:39e7f14a default
r12156:4c94b6d0 default
Show More
test-rename-after-merge.out
43 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-rename-after-merge.out
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
 r5318 % create source repository
adding a
% fork source repository
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
 r5318 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
% update source repository
% merge repositories
pulling from ../t2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Matt Mackall
copy: simplify inner copy...
 r5608 M b
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
 r5318 % rename b as c
A c
R b
% rename back c as b
Matt Mackall
copy: simplify inner copy...
 r5608 M b
Patrick Mezard
Fix a corner case when committing a rename after a merge (issue1476)
 r7689 % test issue 1476
adding a
adding b1
adding b2
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
adding c1
adding c2
created new head
% merge heads
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% commit issue 1476
copies: c2 (c1)
Matt Mackall
rollback: fix up tests
 r11175 rolling back to revision 2 (undo commit)
Patrick Mezard
Fix a corner case when committing a rename after a merge (issue1476)
 r7689 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
% merge heads again
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% commit issue 1476 with a rename on the other side
copies: b2 (b1)